From 0d0bd102af27abda9fbc5f01044259e27f10728c Mon Sep 17 00:00:00 2001
From: Tudor Gradinaru <tudor.rodut@yahoo.com>
Date: Mon, 20 Oct 2025 11:25:08 +0300
Subject: [PATCH 1/5] WIP: Fix indexed access type resolution in hover/quick
 info

---
 src/compiler/checker.ts                       |  8 +++-
 .../quickInfoIndexedAccessWithGeneric.ts      | 40 +++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/quickInfoIndexedAccessWithGeneric.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 48bc0da113816..a1eae075d59b5 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6842,7 +6842,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 return factory.createThisTypeNode();
             }
 
-            if (!inTypeAlias && type.aliasSymbol && (context.flags & NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope || isTypeSymbolAccessible(type.aliasSymbol, context.enclosingDeclaration))) {
+            // When in an object type literal context, expand type aliases to show resolved types
+            // for better clarity in hover information and quick info
+            if (!inTypeAlias && type.aliasSymbol && !(context.flags & NodeBuilderFlags.InObjectTypeLiteral) && (context.flags & NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope || isTypeSymbolAccessible(type.aliasSymbol, context.enclosingDeclaration))) {
                 if (!shouldExpandType(type, context, /*isAlias*/ true)) {
                     const typeArgumentNodes = mapToTypeNodes(type.aliasTypeArguments, context);
                     if (isReservedMemberName(type.aliasSymbol.escapedName) && !(type.aliasSymbol.flags & SymbolFlags.Class)) return factory.createTypeReferenceNode(factory.createIdentifier(""), typeArgumentNodes);
@@ -9028,7 +9030,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             let result;
             const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
             const decl = declaration ?? symbol.valueDeclaration ?? getDeclarationWithTypeAnnotation(symbol) ?? symbol.declarations?.[0];
-            if (!canPossiblyExpandType(type, context) && decl) {
+            // When in an object type literal context, prefer the resolved type over the syntactic form
+            // to ensure indexed access types and generic type aliases are properly resolved
+            if (!canPossiblyExpandType(type, context) && decl && !(context.flags & NodeBuilderFlags.InObjectTypeLiteral)) {
                 const restore = addSymbolTypeToContext(context, symbol, type);
                 if (isAccessor(decl)) {
                     result = syntacticNodeBuilder.serializeTypeOfAccessor(decl, symbol, context);
diff --git a/tests/cases/fourslash/quickInfoIndexedAccessWithGeneric.ts b/tests/cases/fourslash/quickInfoIndexedAccessWithGeneric.ts
new file mode 100644
index 0000000000000..db5e25394a6ff
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoIndexedAccessWithGeneric.ts
@@ -0,0 +1,40 @@
+/// <reference path='fourslash.ts'/>
+
+// @strict: true
+
+// @Filename: /test.ts
+////type Scalars = {
+////  Number: number;
+////};
+////
+////type Maybe<T> = T | null;
+////
+////type TypeA = {
+////  a: Scalars["Number"] | null;
+////  b: Maybe<number>;
+////  c: Scalars["Number"] | null;
+////};
+////
+////type TypeB = {
+////  a: Scalars["Number"] | null;
+////  b: number | null;
+////  c: Scalars["Number"] | null;
+////};
+////
+////const testA: Type/*typeA*/A = null!;
+////const testB: Type/*typeB*/B = null!;
+
+// Both types should show fully resolved types (number | null) for all fields
+goTo.marker("typeA");
+verify.quickInfoIs(`type TypeA = {
+    a: number | null;
+    b: number | null;
+    c: number | null;
+}`);
+
+goTo.marker("typeB");
+verify.quickInfoIs(`type TypeB = {
+    a: number | null;
+    b: number | null;
+    c: number | null;
+}`);

From 9eb59a85879ee2422d185e5b0082c676d183382a Mon Sep 17 00:00:00 2001
From: Tudor Gradinaru <tudor.rodut@yahoo.com>
Date: Sun, 26 Oct 2025 16:22:22 +0200
Subject: [PATCH 2/5] Remove unused baseline file

---
 ...EmitPrivatePromiseLikeInterface.errors.txt | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt

diff --git a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt
deleted file mode 100644
index 31f88d2e8c664..0000000000000
--- a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Api.ts(6,5): error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
-Api.ts(7,5): error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
-Api.ts(8,5): error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
-
-
-==== http-client.ts (0 errors) ====
-    type TPromise<ResolveType, RejectType = any> = Omit<Promise<ResolveType>, "then" | "catch"> & {
-        then<TResult1 = ResolveType, TResult2 = never>(
-            onfulfilled?: ((value: ResolveType) => TResult1 | PromiseLike<TResult1>) | undefined | null,
-            onrejected?: ((reason: RejectType) => TResult2 | PromiseLike<TResult2>) | undefined | null,
-        ): TPromise<TResult1 | TResult2, RejectType>;
-        catch<TResult = never>(
-            onrejected?: ((reason: RejectType) => TResult | PromiseLike<TResult>) | undefined | null,
-        ): TPromise<ResolveType | TResult, RejectType>;
-    };
-    
-    export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
-        data: D;
-        error: E;
-    }
-    
-    export class HttpClient<SecurityDataType = unknown> {
-        public request = <T = any, E = any>(): TPromise<HttpResponse<T, E>> => {
-            return '' as any;
-        };
-    }
-==== Api.ts (3 errors) ====
-    import { HttpClient } from "./http-client";
-    
-    export class Api<SecurityDataType = unknown> {
-        constructor(private http: HttpClient<SecurityDataType>) { }
-    
-        abc1 = () => this.http.request();
-        ~~~~
-!!! error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
-        abc2 = () => this.http.request();
-        ~~~~
-!!! error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
-        abc3 = () => this.http.request();
-        ~~~~
-!!! error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
-    }
\ No newline at end of file

From 07ea18b225869768a08912c8d7a5c8aaa4dd186c Mon Sep 17 00:00:00 2001
From: Tudor Gradinaru <tudor.rodut@yahoo.com>
Date: Sun, 26 Oct 2025 16:53:21 +0200
Subject: [PATCH 3/5] Scope indexed access type resolution to QuickInfo only

---
 src/compiler/checker.ts       | 10 +++++-----
 src/compiler/types.ts         |  4 +++-
 src/services/symbolDisplay.ts |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4b57af111e04e..dbc7b0f3f84c5 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6842,9 +6842,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 return factory.createThisTypeNode();
             }
 
-            // When in an object type literal context, expand type aliases to show resolved types
-            // for better clarity in hover information and quick info
-            if (!inTypeAlias && type.aliasSymbol && !(context.flags & NodeBuilderFlags.InObjectTypeLiteral) && (context.flags & NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope || isTypeSymbolAccessible(type.aliasSymbol, context.enclosingDeclaration))) {
+            // When generating QuickInfo, expand type aliases to show resolved types
+            // for better clarity in hover information
+            if (!inTypeAlias && type.aliasSymbol && !(context.flags & NodeBuilderFlags.InQuickInfo) && (context.flags & NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope || isTypeSymbolAccessible(type.aliasSymbol, context.enclosingDeclaration))) {
                 if (!shouldExpandType(type, context, /*isAlias*/ true)) {
                     const typeArgumentNodes = mapToTypeNodes(type.aliasTypeArguments, context);
                     if (isReservedMemberName(type.aliasSymbol.escapedName) && !(type.aliasSymbol.flags & SymbolFlags.Class)) return factory.createTypeReferenceNode(factory.createIdentifier(""), typeArgumentNodes);
@@ -9030,9 +9030,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             let result;
             const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
             const decl = declaration ?? symbol.valueDeclaration ?? getDeclarationWithTypeAnnotation(symbol) ?? symbol.declarations?.[0];
-            // When in an object type literal context, prefer the resolved type over the syntactic form
+            // When generating QuickInfo, prefer the resolved type over the syntactic form
             // to ensure indexed access types and generic type aliases are properly resolved
-            if (!canPossiblyExpandType(type, context) && decl && !(context.flags & NodeBuilderFlags.InObjectTypeLiteral)) {
+            if (!canPossiblyExpandType(type, context) && decl && !(context.flags & NodeBuilderFlags.InQuickInfo)) {
                 const restore = addSymbolTypeToContext(context, symbol, type);
                 if (isAccessor(decl)) {
                     result = syntacticNodeBuilder.serializeTypeOfAccessor(decl, symbol, context);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 626bcecf9d34a..2b2aeb8a8258d 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5563,6 +5563,7 @@ export const enum NodeBuilderFlags {
     InObjectTypeLiteral                     = 1 << 22,
     InTypeAlias                             = 1 << 23,    // Writing type in type alias declaration
     InInitialEntityName                     = 1 << 24,    // Set when writing the LHS of an entity name or entity name expression
+    InQuickInfo                             = 1 << 27,    // Generating type for QuickInfo/hover - prefer resolved types over aliases
 }
 
 /** @internal */
@@ -5611,10 +5612,11 @@ export const enum TypeFormatFlags {
     InElementType                           = 1 << 21, // Writing an array or union element type
     InFirstTypeArgument                     = 1 << 22, // Writing first type argument of the instantiated type
     InTypeAlias                             = 1 << 23, // Writing type in type alias declaration
+    InQuickInfo                             = 1 << 27, // Generating type for QuickInfo/hover - prefer resolved types
 
     NodeBuilderFlagsMask = NoTruncation | WriteArrayAsGenericType | GenerateNamesForShadowedTypeParams | UseStructuralFallback | WriteTypeArgumentsOfSignature |
         UseFullyQualifiedType | SuppressAnyReturnType | MultilineObjectLiterals | WriteClassExpressionAsTypeLiteral |
-        UseTypeOfFunction | OmitParameterModifiers | UseAliasDefinedOutsideCurrentScope | AllowUniqueESSymbolType | InTypeAlias |
+        UseTypeOfFunction | OmitParameterModifiers | UseAliasDefinedOutsideCurrentScope | AllowUniqueESSymbolType | InTypeAlias | InQuickInfo |
         UseSingleQuotesForStringLiteralType | NoTypeReduction | OmitThisParameter,
 }
 
diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index 03b2b59193621..e00587cd6b9c6 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -111,7 +111,7 @@ import {
     WriterContextOut,
 } from "./_namespaces/ts.js";
 
-const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope | NodeBuilderFlags.InQuickInfo;
 
 // TODO(drosen): use contextual SemanticMeaning.
 /** @internal */
@@ -496,7 +496,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
                 typeChecker,
                 location.parent && isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol),
                 enclosingDeclaration,
-                TypeFormatFlags.InTypeAlias,
+                TypeFormatFlags.InTypeAlias | TypeFormatFlags.InQuickInfo,
                 maximumLength,
                 verbosityLevel,
                 typeWriterOut,

From 729c75aa7478a00aca53c249605f15e49c059dde Mon Sep 17 00:00:00 2001
From: Tudor Gradinaru <tudor.rodut@yahoo.com>
Date: Mon, 27 Oct 2025 10:36:22 +0200
Subject: [PATCH 4/5] Revert "Merge remote-tracking branch 'upstream/main' into
 fix/indexed-access-type-hover"

This reverts commit dce466392bcc3901465e7a307f1169bea9592156, reversing
changes made to 0d0bd102af27abda9fbc5f01044259e27f10728c.
---
 .../workflows/accept-baselines-fix-lints.yaml |   2 +-
 .github/workflows/ci.yml                      |  24 +-
 .github/workflows/codeql.yml                  |   6 +-
 .github/workflows/copilot-setup-steps.yml     |   2 +-
 .github/workflows/insiders.yaml               |   4 +-
 .github/workflows/lkg.yml                     |   2 +-
 .github/workflows/new-release-branch.yaml     |   2 +-
 .github/workflows/nightly.yaml                |   4 +-
 .../workflows/release-branch-artifact.yaml    |   2 +-
 .github/workflows/scorecard.yml               |   2 +-
 .github/workflows/set-version.yaml            |   2 +-
 .github/workflows/sync-branch.yaml            |   2 +-
 .github/workflows/twoslash-repros.yaml        |   2 +-
 .github/workflows/update-package-lock.yaml    |   2 +-
 src/compiler/checker.ts                       |   2 +-
 src/compiler/commandLineParser.ts             |  11 +-
 src/compiler/diagnosticMessages.json          |  11 +-
 src/compiler/parser.ts                        |  27 +-
 src/compiler/program.ts                       |  12 -
 src/compiler/types.ts                         |   5 -
 src/compiler/utilities.ts                     |  58 +-
 src/harness/fourslashInterfaceImpl.ts         |   3 -
 src/services/completions.ts                   |  10 +-
 .../evaluation/awaitUsingDeclarations.ts      |   2 +-
 .../evaluation/updateExpressionInModule.ts    |   8 +-
 .../unittests/evaluation/usingDeclarations.ts |   4 +-
 .../unittests/tscWatch/incremental.ts         |   5 +-
 tests/baselines/reference/APISample_jsdoc.js  |  35 +-
 tests/baselines/reference/APISample_linter.js |  35 +-
 .../reference/APISample_transform.js          |  35 +-
 .../baselines/reference/APISample_watcher.js  |  35 +-
 ...ModuleForStatementNoInitializer.errors.txt |  22 -
 .../aliasesInSystemModule1.errors.txt         |   2 -
 .../aliasesInSystemModule2.errors.txt         |   2 -
 .../allowImportClausesToMergeWithTypes.js     |  12 +-
 ...sions(moduleresolution=classic).errors.txt |   2 -
 ...false,moduleresolution=classic).errors.txt |  19 -
 ...=true,moduleresolution=classic).errors.txt |  19 -
 .../allowSyntheticDefaultImports1.js          |   5 +-
 .../allowSyntheticDefaultImports2.errors.txt  |  12 -
 .../allowSyntheticDefaultImports3.errors.txt  |   4 -
 .../allowSyntheticDefaultImports4.js          |   5 +-
 .../allowSyntheticDefaultImports5.errors.txt  |  14 -
 .../allowSyntheticDefaultImports6.errors.txt  |   4 -
 .../allowSyntheticDefaultImports7.errors.txt  |  13 -
 .../allowSyntheticDefaultImports7.types       |   2 -
 .../allowSyntheticDefaultImports8.errors.txt  |   4 -
 .../allowSyntheticDefaultImports9.js          |   5 +-
 .../reference/ambientDeclarationsPatterns.js  |   5 +-
 ...alModuleInAnotherExternalModule.errors.txt |   4 +-
 ...ntExternalModuleInAnotherExternalModule.js |  18 +-
 ...nalModuleInsideNonAmbientExternalModule.js |   6 +-
 .../ambientExternalModuleMerging.errors.txt   |  19 -
 ...leWithInternalImportDeclaration.errors.txt |  21 -
 ...ithoutInternalImportDeclaration.errors.txt |  20 -
 ...tInsideNonAmbientExternalModule.errors.txt |  10 -
 ...mbientInsideNonAmbientExternalModule.types |   1 -
 tests/baselines/reference/ambientShorthand.js |  37 +-
 .../reference/ambientShorthand_reExport.js    |  35 +-
 ...mdDeclarationEmitNoExtraDeclare.errors.txt |  24 -
 .../amdDeclarationEmitNoExtraDeclare.types    |   1 -
 .../amdDependencyComment2.errors.txt          |   2 -
 .../amdDependencyCommentName2.errors.txt      |   2 -
 .../amdDependencyCommentName3.errors.txt      |   2 -
 .../amdDependencyCommentName4.errors.txt      |   2 -
 .../reference/amdDependencyCommentName4.js    |  38 -
 .../amdImportAsPrimaryExpression.errors.txt   |  15 -
 ...amdImportNotAsPrimaryExpression.errors.txt |  34 -
 ...uplicateDeclarationEmitComments.errors.txt |  10 -
 .../amdModuleConstEnumUsage.errors.txt        |   2 -
 .../reference/amdModuleName1.errors.txt       |  14 -
 .../reference/amdModuleName2.errors.txt       |   2 -
 .../anonymousDefaultExportsAmd.errors.txt     |   9 -
 .../anonymousDefaultExportsSystem.errors.txt  |   9 -
 .../anonymousDefaultExportsUmd.errors.txt     |   9 -
 tests/baselines/reference/api/typescript.d.ts |   5 -
 ...eIdentifiers_module(module=amd).errors.txt |   2 -
 ...NamespaceIdentifiers_module(module=amd).js |  35 +-
 ...paceIdentifiers_module(module=commonjs).js |  35 +-
 ...Identifiers_module(module=none).errors.txt |   2 -
 ...amespaceIdentifiers_module(module=none).js |  35 +-
 ...entifiers_module(module=system).errors.txt |   2 -
 ...eIdentifiers_module(module=umd).errors.txt |   2 -
 ...NamespaceIdentifiers_module(module=umd).js |  35 +-
 .../assertionFunctionWildcardImport1.js       | 105 +--
 .../assertionFunctionWildcardImport2.js       |  35 +-
 ...syncAwaitIsolatedModules_es2017.errors.txt |   4 +-
 .../asyncAwaitIsolatedModules_es6.errors.txt  |   4 +-
 .../reference/asyncImportNestedYield.js       |  37 +-
 .../reference/augmentExportEquals1.js         |  23 +-
 .../augmentExportEquals1_1.errors.txt         |   2 -
 .../reference/augmentExportEquals2.js         |  23 +-
 .../augmentExportEquals2_1.errors.txt         |   2 -
 .../reference/augmentExportEquals3.js         |  66 +-
 .../augmentExportEquals3_1.errors.txt         |  30 -
 .../reference/augmentExportEquals3_1.js       |  34 -
 .../reference/augmentExportEquals3_1.types    |   1 -
 .../reference/augmentExportEquals4.js         |  72 +-
 .../augmentExportEquals4_1.errors.txt         |  30 -
 .../reference/augmentExportEquals4_1.js       |  34 -
 .../reference/augmentExportEquals4_1.types    |   1 -
 .../reference/augmentExportEquals5.js         |  17 +-
 .../reference/augmentExportEquals5.types      |   4 +-
 .../reference/augmentExportEquals6.js         |  88 +-
 .../augmentExportEquals6_1.errors.txt         |  28 -
 .../reference/augmentExportEquals7.types      |   4 +-
 .../augmentedTypesExternalModule1.errors.txt  |   8 -
 ...allowedModifiers(target=es2017).errors.txt |   4 +-
 ...allowedModifiers(target=esnext).errors.txt |   4 +-
 ...pLevelOfModule.1(module=system).errors.txt |  18 -
 .../badExternalModuleReference.errors.txt     |   4 +-
 .../reference/badExternalModuleReference.js   |   6 +-
 .../reference/bangInModuleName.errors.txt     |  17 -
 ...nctionDeclarationInStrictModule.errors.txt |   5 +-
 ...ScopedFunctionDeclarationInStrictModule.js |  14 +-
 ...ockScopedNamespaceDifferentFile.errors.txt |  22 -
 .../blockScopedNamespaceDifferentFile.types   |   1 -
 .../reference/cacheResolutions.errors.txt     |  12 -
 .../cachedModuleResolution3.errors.txt        |  12 -
 .../cachedModuleResolution4.errors.txt        |  13 -
 .../cachedModuleResolution8.errors.txt        |   2 -
 .../cachedModuleResolution9.errors.txt        |   2 -
 .../capturedLetConstInLoop4.errors.txt        | 147 ----
 .../reference/capturedLetConstInLoop4.types   |  58 --
 tests/baselines/reference/chained2.js         |  40 +-
 .../checkJsdocTypeTagOnExportAssignment1.js   |   5 +-
 .../checkJsdocTypeTagOnExportAssignment2.js   |   5 +-
 .../checkJsdocTypeTagOnExportAssignment3.js   |   5 +-
 .../checkJsdocTypeTagOnExportAssignment5.js   |   5 +-
 .../checkJsdocTypeTagOnExportAssignment6.js   |   5 +-
 .../checkJsdocTypeTagOnExportAssignment7.js   |   5 +-
 .../checkJsxGenericTagHasCorrectInferences.js |  35 +-
 .../reference/checkJsxNotSetError.js          |   5 +-
 .../checkJsxSubtleSkipContextSensitiveBug.js  |  35 +-
 .../classStaticBlock24(module=amd).errors.txt |  12 -
 ...assStaticBlock24(module=system).errors.txt |  12 -
 .../classStaticBlock24(module=umd).errors.txt |  12 -
 ...collisionExportsRequireAndAlias.errors.txt |   4 +-
 .../collisionExportsRequireAndAlias.js        |  52 +-
 .../collisionExportsRequireAndAlias.symbols   |  10 +-
 .../collisionExportsRequireAndAlias.types     |   4 +-
 .../collisionExportsRequireAndAmbientClass.js |  12 +-
 .../collisionExportsRequireAndAmbientEnum.js  |  12 +-
 ...llisionExportsRequireAndAmbientFunction.js |  14 +-
 ...collisionExportsRequireAndAmbientModule.js |  30 +-
 .../collisionExportsRequireAndAmbientVar.js   |  14 +-
 ...collisionExportsRequireAndClass.errors.txt |   2 -
 .../collisionExportsRequireAndEnum.errors.txt |   2 -
 ...lisionExportsRequireAndFunction.errors.txt |   2 -
 ...tsRequireAndInternalModuleAlias.errors.txt |   2 -
 ...ollisionExportsRequireAndModule.errors.txt |   2 -
 ...sRequireAndUninstantiatedModule.errors.txt |  19 -
 .../collisionExportsRequireAndVar.errors.txt  |   2 -
 .../commentOnImportStatement1.errors.txt      |   4 +-
 .../reference/commentOnImportStatement1.js    |   6 +-
 ...ommentsBeforeVariableStatement1.errors.txt |   8 -
 .../commentsDottedModuleName.errors.txt       |  11 -
 .../commentsExternalModules.errors.txt        |  63 --
 .../commentsExternalModules2.errors.txt       |  63 --
 .../commentsMultiModuleMultiFile.errors.txt   |  38 -
 ...le=system,moduledetection=auto).errors.txt |  25 -
 ...,module=system,moduledetection=auto).types |   3 +-
 ...e=system,moduledetection=force).errors.txt |  25 -
 ...module=system,moduledetection=force).types |   3 +-
 ...=system,moduledetection=legacy).errors.txt |  25 -
 ...odule=system,moduledetection=legacy).types |   3 +-
 ...le=system,moduledetection=auto).errors.txt |   2 -
 ...e=system,moduledetection=force).errors.txt |   2 -
 ...=system,moduledetection=legacy).errors.txt |   2 -
 ...le=system,moduledetection=auto).errors.txt |   2 -
 ...e=system,moduledetection=force).errors.txt |   2 -
 ...=system,moduledetection=legacy).errors.txt |   2 -
 ...le=system,moduledetection=auto).errors.txt |   2 -
 ...e=system,moduledetection=force).errors.txt |   2 -
 ...=system,moduledetection=legacy).errors.txt |   2 -
 .../reference/commonSourceDir5.errors.txt     |   4 +-
 tests/baselines/reference/commonSourceDir5.js |  38 +
 .../reference/commonSourceDir6.errors.txt     |  18 -
 .../Parse empty options of --module.js        |   2 +-
 ...rse empty options of --moduleResolution.js |   2 +-
 ...odule to compiler-options with json api.js |   2 +-
 ...ompiler-options with jsonSourceFile api.js |   2 +-
 ...ution to compiler-options with json api.js |   2 +-
 ...ompiler-options with jsonSourceFile api.js |   2 +-
 .../tsconfig.json                             |   1 +
 .../module/tsconfig.json                      |   1 +
 .../moduleResolution/tsconfig.json            |   1 +
 ...lictingDeclarationsImportFromNamespace1.js |  35 +-
 ...lictingDeclarationsImportFromNamespace2.js |  35 +-
 .../constDeclarations-access5.errors.txt      |   2 +-
 .../reference/constDeclarations-access5.js    |  80 +-
 .../constDeclarations-access5.symbols         |   2 +-
 .../reference/constDeclarations-access5.types |   2 +-
 .../constEnumExternalModule.errors.txt        |  13 -
 .../constEnumMergingWithValues1.errors.txt    |  11 -
 .../constEnumMergingWithValues2.errors.txt    |  11 -
 .../constEnumMergingWithValues3.errors.txt    |  11 -
 .../constEnumMergingWithValues4.errors.txt    |  15 -
 .../constEnumMergingWithValues5.errors.txt    |  10 -
 ...nceCausesNoImport(isolatedmodules=true).js |  35 +-
 ...stEnumNamespaceReferenceCausesNoImport2.js |  35 +-
 ...llyTypedStringLiteralsInJsxAttributes02.js |  41 +-
 .../copyrightWithNewLine1.errors.txt          |   4 +-
 .../reference/copyrightWithNewLine1.js        |  15 +-
 .../copyrightWithoutNewLine1.errors.txt       |   4 +-
 .../reference/copyrightWithoutNewLine1.js     |  18 +-
 .../crashIntypeCheckInvocationExpression.js   |  19 +-
 ...peCheckObjectCreationExpression.errors.txt |   2 -
 ...ortAssignmentOfGenericInterface.errors.txt |  14 -
 .../declFileExportImportChain.errors.txt      |  26 -
 .../declFileExportImportChain2.errors.txt     |  23 -
 ...declarationEmitAmdModuleDefault.errors.txt |   6 -
 ...ationEmitAmdModuleNameDirective.errors.txt |  11 -
 ...clarationEmitAnyComputedPropertyInClass.js |   5 +-
 ...EmitBundleWithAmbientReferences.errors.txt |  23 -
 ...clarationEmitComputedNameConstEnumAlias.js |   5 +-
 ...mitDefaultExportWithTempVarName.errors.txt |   6 -
 ...portWithTempVarNameWithBundling.errors.txt |   6 -
 ...rationEmitExportAliasVisibiilityMarking.js |  35 +-
 .../declarationEmitExpressionInExtends6.js    |  35 +-
 ...dTypeDistributivityPreservesConstraints.js |   5 +-
 ...ationEmitMappedTypeTemplateTypeofSymbol.js |  35 +-
 ...larationEmitObjectAssignedDefaultExport.js |   5 +-
 .../declarationEmitOfTypeofAliasedExport.js   |  35 +-
 ...PrefersPathKindBasedOnBundling2.errors.txt |   2 -
 ...RetainedAnnotationRetainsImportInOutput.js |  35 +-
 .../declarationEmitTypeofDefaultExport.js     |  35 +-
 ...eclarationEmitWithDefaultAsComputedName.js |   5 +-
 ...clarationEmitWithDefaultAsComputedName2.js |  35 +-
 ...eForJsonImport(resolvejsonmodule=false).js |   5 +-
 ...leForJsonImport(resolvejsonmodule=true).js |   5 +-
 .../declarationMapsOutFile.errors.txt         |  22 -
 .../reference/declarationMerging2.errors.txt  |  17 -
 ...arationsIndirectGeneratedAliasReference.js |  38 +-
 .../decoratedClassExportsSystem1.errors.txt   |  12 -
 .../decoratedClassExportsSystem1.types        |   4 -
 .../decoratedClassExportsSystem2.errors.txt   |   9 -
 .../decoratedClassExportsSystem2.types        |   4 -
 ...ecoratedClassFromExternalModule.errors.txt |  13 -
 .../decoratedClassFromExternalModule.types    |   5 +-
 ...tedDefaultExportsGetExportedAmd.errors.txt |  16 -
 ...DefaultExportsGetExportedSystem.errors.txt |  15 -
 ...tedDefaultExportsGetExportedUmd.errors.txt |  16 -
 .../baselines/reference/decoratorMetadata.js  |   5 +-
 ...dataWithImportDeclarationNameCollision4.js |   2 +-
 ...dataWithImportDeclarationNameCollision5.js |   2 +-
 ...dataWithImportDeclarationNameCollision6.js |   2 +-
 ...dataWithImportDeclarationNameCollision7.js |   2 +-
 .../reference/decoratorOnAwait.errors.txt     |  11 -
 tests/baselines/reference/decoratorOnAwait.js |  11 -
 .../reference/decoratorOnAwait.symbols        |  15 -
 .../reference/decoratorOnAwait.types          |  19 -
 .../reference/decoratorOnUsing.errors.txt     |  14 -
 tests/baselines/reference/decoratorOnUsing.js |  16 -
 .../reference/decoratorOnUsing.symbols        |  21 -
 .../reference/decoratorOnUsing.types          |  25 -
 .../deduplicateImportsInSystem.errors.txt     |   2 -
 ...ltDeclarationEmitShadowedNamedCorrectly.js |  35 +-
 ...efaultExportInAwaitExpression01.errors.txt |  15 -
 .../defaultExportInAwaitExpression01.js       |   5 +-
 .../defaultExportInAwaitExpression02.js       |   5 +-
 .../reference/defaultExportsCannotMerge01.js  |   5 +-
 .../reference/defaultExportsCannotMerge02.js  |   5 +-
 .../reference/defaultExportsCannotMerge03.js  |   5 +-
 .../defaultExportsGetExportedAmd.errors.txt   |  10 -
 ...defaultExportsGetExportedSystem.errors.txt |  10 -
 .../defaultExportsGetExportedUmd.errors.txt   |  10 -
 .../dependencyViaImportAlias.errors.txt       |  13 -
 .../deprecatedCompilerOptions2.errors.txt     |  24 -
 .../deprecatedCompilerOptions6.errors.txt     |   5 +-
 ...ucturingInVariableDeclarations3.errors.txt |  10 -
 ...ucturingInVariableDeclarations4.errors.txt |  11 -
 ...ucturingInVariableDeclarations5.errors.txt |  10 -
 ...ucturingInVariableDeclarations6.errors.txt |  11 -
 ...ucturingInVariableDeclarations7.errors.txt |  10 -
 ...ucturingInVariableDeclarations8.errors.txt |  11 -
 .../reference/dottedNamesInSystem.errors.txt  |  12 -
 ...dNotShortCircuitBaseTypeBinding.errors.txt |  22 -
 .../reference/duplicateLocalVariable2.js      |  79 +-
 ...cateObjectLiteralProperty_computedName3.js |  35 +-
 .../duplicatePackage_referenceTypes.js        |  35 +-
 .../reference/duplicatePackage_subModule.js   |  35 +-
 .../duplicateSymbolsExportMatching.js         |  76 +-
 .../dynamicImportEvaluateSpecifier.js         |  39 +-
 .../dynamicImportInDefaultExportExpression.js |  35 +-
 .../reference/dynamicImportTrailingComma.js   |  35 +-
 ...amicImportWithNestedThis_es2015.errors.txt |  16 -
 .../dynamicImportWithNestedThis_es2015.js     |  35 +-
 ...dynamicImportWithNestedThis_es5.errors.txt |  16 -
 .../dynamicImportWithNestedThis_es5.js        |  35 +-
 .../reference/dynamicRequire.errors.txt       |   9 -
 .../baselines/reference/dynamicRequire.types  |   5 -
 ...itBundleWithPrologueDirectives1.errors.txt |  10 -
 .../emitBundleWithShebang1.errors.txt         |   8 -
 .../emitBundleWithShebang2.errors.txt         |  13 -
 ...thShebangAndPrologueDirectives1.errors.txt |   9 -
 ...thShebangAndPrologueDirectives2.errors.txt |  16 -
 ...tadata_isolatedModules(module=commonjs).js |  35 +-
 ...WithLocalCollisions(module=amd).errors.txt |  12 -
 ...hLocalCollisions(module=node16).errors.txt |  12 +
 ...lpersWithLocalCollisions(module=node16).js |   7 +-
 ...hLocalCollisions(module=node18).errors.txt |  12 +
 ...lpersWithLocalCollisions(module=node18).js |   7 +-
 ...hLocalCollisions(module=node20).errors.txt |  14 +
 ...lpersWithLocalCollisions(module=node20).js |   7 +-
 ...ocalCollisions(module=nodenext).errors.txt |  14 +
 ...ersWithLocalCollisions(module=nodenext).js |   7 +-
 ...ithLocalCollisions(module=none).errors.txt |  12 -
 ...hLocalCollisions(module=system).errors.txt |  12 -
 ...WithLocalCollisions(module=umd).errors.txt |  12 -
 .../emitModuleCommonJS(module=commonjs).js    |  74 +-
 tests/baselines/reference/emptyModuleName.js  |  35 +-
 ...ithImplicitModuleResolutionNone.errors.txt |   4 +-
 .../errorForConflictingExportEqualsValue.js   |  35 +-
 tests/baselines/reference/es5-amd.errors.txt  |  17 -
 .../reference/es5-declaration-amd.errors.txt  |  17 -
 .../es5-importHelpersAsyncFunctions.js        |   2 +-
 .../es5-importHelpersAsyncFunctions.symbols   |  50 +-
 .../es5-importHelpersAsyncFunctions.types     |   2 +-
 .../reference/es5-souremap-amd.errors.txt     |  17 -
 .../baselines/reference/es5-system.errors.txt |  18 -
 .../reference/es5-system2.errors.txt          |   6 -
 tests/baselines/reference/es5-umd.errors.txt  |  18 -
 tests/baselines/reference/es5-umd2.errors.txt |  18 -
 tests/baselines/reference/es5-umd3.errors.txt |  18 -
 tests/baselines/reference/es5-umd4.errors.txt |  20 -
 .../es5ModuleInternalNamedImports.errors.txt  |   4 +-
 .../es5ModuleInternalNamedImports.js          |  60 +-
 .../es5ModuleWithModuleGenAmd.errors.txt      |  16 -
 tests/baselines/reference/es6-amd.errors.txt  |  17 -
 .../reference/es6-declaration-amd.errors.txt  |  17 -
 .../reference/es6-sourcemap-amd.errors.txt    |  17 -
 tests/baselines/reference/es6-umd.errors.txt  |  17 -
 tests/baselines/reference/es6-umd2.errors.txt |  17 -
 .../reference/es6ExportAll.errors.txt         |  19 -
 .../reference/es6ExportAssignment2.errors.txt |   2 +-
 .../reference/es6ExportAssignment2.js         |   2 +-
 .../reference/es6ExportAssignment2.symbols    |   2 +-
 .../reference/es6ExportAssignment2.types      |   2 +-
 .../reference/es6ExportAssignment3.errors.txt |  12 -
 .../reference/es6ExportAssignment3.types      |   4 +-
 .../es6ExportClauseWithoutModuleSpecifier.js  |  28 +-
 ...ExportClauseWithoutModuleSpecifier.symbols |  10 +-
 ...s6ExportClauseWithoutModuleSpecifier.types |  10 +-
 .../reference/es6ExportEqualsInterop.js       |  40 +-
 .../reference/es6ExportEqualsInterop.types    |   8 +-
 .../reference/es6ImportDefaultBinding.js      |   6 +-
 .../reference/es6ImportDefaultBinding.symbols |   4 +-
 .../reference/es6ImportDefaultBinding.types   |   4 +-
 .../es6ImportDefaultBindingAmd.errors.txt     |  13 -
 .../reference/es6ImportDefaultBindingAmd.js   |   4 -
 .../reference/es6ImportDefaultBindingDts.js   |   5 +-
 ...BindingFollowedWithNamedImport1.errors.txt |  36 +-
 ...tDefaultBindingFollowedWithNamedImport1.js |  24 +-
 ...ultBindingFollowedWithNamedImport1.symbols |  12 +-
 ...faultBindingFollowedWithNamedImport1.types |  12 +-
 ...ultBindingFollowedWithNamedImport1InEs5.js |  15 +-
 ...ndingFollowedWithNamedImport1WithExport.js |  15 +-
 ...faultBindingFollowedWithNamedImportDts1.js |  15 +-
 ...llowedWithNamedImportWithExport.errors.txt |  12 +-
 ...indingFollowedWithNamedImportWithExport.js |  53 +-
 ...gFollowedWithNamedImportWithExport.symbols |  12 +-
 ...ingFollowedWithNamedImportWithExport.types |  12 +-
 ...ingFollowedWithNamespaceBinding.errors.txt |   2 +-
 ...aultBindingFollowedWithNamespaceBinding.js |   4 +-
 ...indingFollowedWithNamespaceBinding.symbols |   2 +-
 ...tBindingFollowedWithNamespaceBinding.types |   2 +-
 ...ultBindingFollowedWithNamespaceBinding1.js |   4 +-
 ...ndingFollowedWithNamespaceBinding1.symbols |   2 +-
 ...BindingFollowedWithNamespaceBinding1.types |   2 +-
 ...ndingFollowedWithNamespaceBinding1InEs5.js |   5 +-
 ...WithNamespaceBinding1WithExport.errors.txt |   4 +-
 ...FollowedWithNamespaceBinding1WithExport.js |   8 +-
 ...wedWithNamespaceBinding1WithExport.symbols |   2 +-
 ...lowedWithNamespaceBinding1WithExport.types |   2 +-
 ...tBindingFollowedWithNamespaceBindingDts.js |  35 +-
 ...ollowedWithNamespaceBindingDts1.errors.txt |  11 -
 ...BindingFollowedWithNamespaceBindingDts1.js |  10 +-
 ...ngFollowedWithNamespaceBindingDts1.symbols |   2 +-
 ...dingFollowedWithNamespaceBindingDts1.types |   2 +-
 ...indingFollowedWithNamespaceBindingInEs5.js |  35 +-
 ...gFollowedWithNamespaceBindingWithExport.js |  35 +-
 .../es6ImportDefaultBindingMergeErrors.js     |   5 +-
 ...6ImportDefaultBindingWithExport.errors.txt |   4 +-
 .../es6ImportDefaultBindingWithExport.js      |  28 +-
 .../es6ImportDefaultBindingWithExport.symbols |   4 +-
 .../es6ImportDefaultBindingWithExport.types   |   4 +-
 .../es6ImportEqualsDeclaration.errors.txt     |   4 +-
 .../reference/es6ImportEqualsDeclaration.js   |   2 +-
 .../es6ImportEqualsDeclaration.symbols        |   2 +-
 .../es6ImportEqualsDeclaration.types          |   2 +-
 ...s6ImportEqualsExportModuleCommonJsError.js |  35 +-
 .../reference/es6ImportNameSpaceImport.js     |  35 +-
 .../es6ImportNameSpaceImportAmd.errors.txt    |  12 -
 .../reference/es6ImportNameSpaceImportAmd.js  |  34 -
 .../reference/es6ImportNameSpaceImportDts.js  |  35 +-
 .../es6ImportNameSpaceImportInEs5.js          |  35 +-
 ...ImportNameSpaceImportWithExport.errors.txt |   2 -
 .../es6ImportNameSpaceImportWithExport.js     |  34 -
 .../es6ImportNamedImportAmd.errors.txt        |  43 -
 ...rtNamedImportIdentifiersParsing.errors.txt |  20 +-
 ...ImportNamedImportNoNamedExports.errors.txt |   8 +-
 ...s6ImportNamedImportParsingError.errors.txt |  10 +-
 .../es6ImportNamedImportParsingError.js       |  14 +-
 .../es6ImportNamedImportParsingError.symbols  |   8 +-
 .../es6ImportNamedImportParsingError.types    |  20 +-
 .../es6ImportWithoutFromClause.errors.txt     |  11 -
 .../es6ImportWithoutFromClauseAmd.errors.txt  |  15 -
 ...FromClauseNonInstantiatedModule.errors.txt |  11 -
 ...es6ModuleWithModuleGenTargetAmd.errors.txt |  16 -
 .../es6modulekindWithES5Target10.errors.txt   |   4 +-
 .../es6modulekindWithES5Target9.errors.txt    |  20 +-
 ...ingEmitHelpers-classDecorator.1.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.2.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.3.errors.txt |   2 -
 ...rs-nonStaticPrivateAutoAccessor.errors.txt |   2 -
 ...itHelpers-nonStaticPrivateField.errors.txt |   2 -
 ...tHelpers-nonStaticPrivateGetter.errors.txt |   2 -
 ...tHelpers-nonStaticPrivateMethod.errors.txt |   2 -
 ...tHelpers-nonStaticPrivateSetter.errors.txt |   2 -
 ...pers-staticComputedAutoAccessor.errors.txt |   2 -
 ...EmitHelpers-staticComputedField.errors.txt |   2 -
 ...mitHelpers-staticComputedGetter.errors.txt |   2 -
 ...mitHelpers-staticComputedMethod.errors.txt |   2 -
 ...mitHelpers-staticComputedSetter.errors.txt |   2 -
 ...lpers-staticPrivateAutoAccessor.errors.txt |   2 -
 ...gEmitHelpers-staticPrivateField.errors.txt |   2 -
 ...EmitHelpers-staticPrivateGetter.errors.txt |   2 -
 ...EmitHelpers-staticPrivateMethod.errors.txt |   2 -
 ...EmitHelpers-staticPrivateSetter.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.1.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.10.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.11.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.12.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.13.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.14.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.15.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.16.errors.txt |   2 -
 ...ngEmitHelpers-classDecorator.17.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.2.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.3.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.4.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.5.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.6.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.7.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.8.errors.txt |   2 -
 ...ingEmitHelpers-classDecorator.9.errors.txt |   2 -
 ...Exports2(esmoduleinterop=false).errors.txt |   2 -
 ...esnextmodulekindWithES5Target10.errors.txt |   4 +-
 .../esnextmodulekindWithES5Target9.errors.txt |  20 +-
 .../expandoFunctionContextualTypesNoValue.js  |   5 +-
 .../exportAndImport-es5-amd.errors.txt        |  14 -
 .../reference/exportAndImport-es5-amd.js      |   4 -
 .../reference/exportAndImport-es5.js          |   5 +-
 .../exportAsNamespace1(module=amd).errors.txt |   2 -
 .../exportAsNamespace1(module=amd).js         |  69 +-
 .../exportAsNamespace1(module=commonjs).js    |  70 +-
 ...portAsNamespace1(module=system).errors.txt |   2 -
 .../exportAsNamespace1(module=umd).errors.txt |   2 -
 .../exportAsNamespace1(module=umd).js         |  70 +-
 .../exportAsNamespace2(module=amd).errors.txt |   2 -
 ...portAsNamespace2(module=system).errors.txt |   2 -
 .../exportAsNamespace2(module=umd).errors.txt |   2 -
 .../exportAsNamespace3(module=amd).errors.txt |   2 -
 ...portAsNamespace3(module=system).errors.txt |   2 -
 .../exportAsNamespace3(module=umd).errors.txt |   2 -
 .../exportAsNamespace4(module=amd).errors.txt |  24 -
 ...portAsNamespace4(module=system).errors.txt |  24 -
 .../exportAsNamespace4(module=umd).errors.txt |  24 -
 .../reference/exportAsNamespace_augment.js    |  35 +-
 .../exportAsNamespace_nonExistent.errors.txt  |   4 +-
 ...ortAssignedTypeAsTypeAnnotation.errors.txt |  16 -
 .../exportAssignmentAndDeclaration.js         |  28 +-
 ...exportAssignmentCircularModules.errors.txt |  25 -
 .../exportAssignmentCircularModules.types     |   6 -
 .../exportAssignmentClass.errors.txt          |  14 -
 .../exportAssignmentError.errors.txt          |  13 -
 .../reference/exportAssignmentError.types     |   1 -
 .../exportAssignmentFunction.errors.txt       |  13 -
 .../exportAssignmentImportMergeNoCrash.js     |   5 +-
 .../exportAssignmentInterface.errors.txt      |  17 -
 .../exportAssignmentInternalModule.errors.txt |  15 -
 .../exportAssignmentInternalModule.types      |   2 -
 ...exportAssignmentMergedInterface.errors.txt |  25 -
 .../exportAssignmentOfGenericType1.errors.txt |  16 -
 ...exportAssignmentTopLevelClodule.errors.txt |  19 -
 ...xportAssignmentTopLevelEnumdule.errors.txt |  20 -
 ...exportAssignmentTopLevelFundule.errors.txt |  19 -
 ...ortAssignmentTopLevelIdentifier.errors.txt |  16 -
 ...WithImportStatementPrivacyError.errors.txt |  26 -
 ...nmentWithImportStatementPrivacyError.types |   3 -
 ...xportAssignmentWithPrivacyError.errors.txt |  22 -
 .../exportAssignmentWithPrivacyError.types    |   3 -
 ...lowSyntheticDefaultImportsError.errors.txt |   8 +-
 ...outAllowSyntheticDefaultImportsError.types |   4 +-
 .../exportClassNameWithObjectAMD.errors.txt   |   2 -
 ...exportClassNameWithObjectSystem.errors.txt |   2 -
 .../exportClassNameWithObjectUMD.errors.txt   |   2 -
 ...MemberOfSameName(module=system).errors.txt |  19 -
 .../reference/exportDeclareClass1.js          |  10 +-
 .../reference/exportDefaultAbstractClass.js   |   5 +-
 .../exportDefaultAsyncFunction2.errors.txt    |   8 +-
 .../reference/exportDefaultAsyncFunction2.js  |  16 +-
 .../exportDefaultAsyncFunction2.symbols       |   8 +-
 .../exportDefaultAsyncFunction2.types         |   8 +-
 .../reference/exportDefaultDuplicateCrash.js  |   5 +-
 .../exportDefaultMarksIdentifierAsUsed.js     |   5 +-
 .../reference/exportDefaultProperty.js        |  11 +-
 .../reference/exportDefaultProperty2.js       |   5 +-
 .../exportDefaultQualifiedNameNoError.js      |   5 +-
 .../reference/exportDefaultStripsFreshness.js |  35 +-
 ...gPattern(module=amd,target=es5).errors.txt |   6 -
 ...ttern(module=amd,target=esnext).errors.txt |   6 -
 ...ttern(module=system,target=es5).errors.txt |   6 -
 ...rn(module=system,target=esnext).errors.txt |   6 -
 ...gPattern(module=amd,target=es5).errors.txt |   6 -
 ...ttern(module=amd,target=esnext).errors.txt |   6 -
 ...ttern(module=system,target=es5).errors.txt |   6 -
 ...rn(module=system,target=esnext).errors.txt |   6 -
 .../reference/exportEqualCallable.errors.txt  |  15 -
 .../reference/exportEqualCallable.types       |   1 -
 .../reference/exportEqualErrorType.errors.txt |   2 +-
 .../reference/exportEqualErrorType.js         |  20 +-
 .../reference/exportEqualErrorType.symbols    |   2 +-
 .../reference/exportEqualErrorType.types      |   2 +-
 .../exportEqualNamespaces.errors.txt          |  18 -
 .../reference/exportEqualsAmd.errors.txt      |   6 -
 .../reference/exportEqualsDefaultProperty.js  |   5 +-
 .../reference/exportEqualsUmd.errors.txt      |   6 -
 .../reference/exportImport.errors.txt         |  17 -
 ...tCanSubstituteConstEnumForValue.errors.txt |  63 --
 .../exportImportMultipleFiles.errors.txt      |  15 -
 .../reference/exportImportMultipleFiles.types |   7 -
 ...ortImportNonInstantiatedModule2.errors.txt |  17 -
 .../baselines/reference/exportNamespace11.js  |  35 +-
 .../baselines/reference/exportNamespace12.js  |  35 +-
 tests/baselines/reference/exportNamespace2.js |  35 +-
 tests/baselines/reference/exportNamespace3.js |  35 +-
 ...xportNonInitializedVariablesAMD.errors.txt |   2 -
 ...tatementNoCrash1(module=system).errors.txt |   2 -
 ...rtNonInitializedVariablesSystem.errors.txt |   2 -
 ...xportNonInitializedVariablesUMD.errors.txt |   2 -
 ...jectRest(module=amd,target=es5).errors.txt |   6 -
 ...tRest(module=amd,target=esnext).errors.txt |   6 -
 ...tRest(module=system,target=es5).errors.txt |   6 -
 ...st(module=system,target=esnext).errors.txt |   6 -
 .../reference/exportSameNameFuncVar.js        |  16 +-
 .../reference/exportStar-amd.errors.txt       |   2 -
 tests/baselines/reference/exportStar-amd.js   |  34 -
 tests/baselines/reference/exportStar.js       |  35 +-
 .../reference/exportStarForValues.errors.txt  |  10 -
 .../reference/exportStarForValues.types       |   2 -
 .../exportStarForValues10.errors.txt          |  14 -
 .../reference/exportStarForValues10.types     |   1 -
 .../reference/exportStarForValues2.errors.txt |  14 -
 .../reference/exportStarForValues2.types      |   1 -
 .../reference/exportStarForValues3.errors.txt |  26 -
 .../reference/exportStarForValues3.types      |   4 -
 .../reference/exportStarForValues4.errors.txt |  18 -
 .../reference/exportStarForValues4.types      |   3 -
 .../reference/exportStarForValues5.errors.txt |  10 -
 .../reference/exportStarForValues5.types      |   2 -
 .../reference/exportStarForValues6.errors.txt |  10 -
 .../reference/exportStarForValues6.types      |   1 -
 .../reference/exportStarForValues7.errors.txt |  14 -
 .../reference/exportStarForValues7.types      |   1 -
 .../reference/exportStarForValues8.errors.txt |  26 -
 .../reference/exportStarForValues8.types      |   4 -
 .../reference/exportStarForValues9.errors.txt |  18 -
 .../reference/exportStarForValues9.types      |   3 -
 .../exportStarForValuesInSystem.errors.txt    |  10 -
 .../exportStarForValuesInSystem.types         |   1 -
 .../reference/exportStarFromEmptyModule.js    |  35 +-
 .../reference/exportStarNotElided.js          |  24 +-
 ...portTypeMergedWithExportStarAsNamespace.js |  35 +-
 .../exportedBlockScopedDeclarations.js        |  41 +-
 ...eInaccessibleInCallbackInModule.errors.txt |  17 -
 ...erfaceInaccessibleInCallbackInModule.types |   4 -
 .../reference/exportedVariable1.errors.txt    |   8 -
 .../exportingContainingVisibleType.errors.txt |  15 -
 .../exportsAndImports1-amd.errors.txt         |  36 -
 .../reference/exportsAndImports1-amd.types    |   1 -
 .../exportsAndImports2-amd.errors.txt         |  15 -
 .../exportsAndImports3-amd.errors.txt         |  36 -
 .../reference/exportsAndImports3-amd.types    |   1 -
 .../exportsAndImports4-amd.errors.txt         |  41 -
 .../reference/exportsAndImports4-amd.js       |  41 -
 .../reference/exportsAndImports4-amd.types    |  18 +-
 .../reference/exportsAndImports4-es6.js       |  46 +-
 .../reference/exportsAndImports4-es6.types    |  18 +-
 .../baselines/reference/exportsAndImports4.js |  46 +-
 .../reference/exportsAndImports4.types        |  18 +-
 ...sAndImportsWithContextualKeywordNames02.js |  35 +-
 .../exportsAndImportsWithUnderscores1.js      |   5 +-
 .../exportsAndImportsWithUnderscores2.js      |   5 +-
 .../exportsAndImportsWithUnderscores3.js      |   5 +-
 .../exportsInAmbientModules1.errors.txt       |  11 -
 .../exportsInAmbientModules2.errors.txt       |  11 -
 ...essionsForbiddenInParameterInitializers.js |  35 +-
 .../reference/extendsUntypedModule.js         |   5 +-
 ...ority(moduleresolution=classic).errors.txt |  20 -
 .../externalModuleAssignToVar.errors.txt      |  29 -
 .../externalModuleImmutableBindings.js        |  35 +-
 ...rtDeclarationWithExportModifier.errors.txt |  11 -
 .../reference/fieldAndGetterWithSameName.js   |  30 +-
 ...tingIntoSameOutputWithOutOption.errors.txt |  12 -
 .../generatorES6InAMDModule.errors.txt        |   8 -
 .../reference/generatorES6InAMDModule.types   |   1 -
 .../genericClassesInModule2.errors.txt        |  25 -
 ...cInterfaceFunctionTypeParameter.errors.txt |  12 -
 .../reference/genericMemberFunction.js        |  73 +-
 ...rsiveImplicitConstructorErrors1.errors.txt |   2 -
 .../reference/genericReturnTypeFromGetter1.js |  32 +-
 .../genericTypeWithMultipleBases2.errors.txt  |  23 -
 ...WithIndexerOfTypeParameterType2.errors.txt |  19 -
 tests/baselines/reference/giant.js            | 598 ++++++-------
 .../goToDefinitionImports.baseline.jsonc      |   4 +-
 .../reference/ignoredJsxAttributes.js         |  35 +-
 ...liedNodeFormatEmit1(module=amd).errors.txt |   2 -
 ...dNodeFormatEmit1(module=system).errors.txt |   2 -
 ...liedNodeFormatEmit1(module=umd).errors.txt |   2 -
 .../importAssertion1(module=commonjs).js      |  86 +-
 .../importAssertion2(module=commonjs).js      |  24 +-
 .../importAttributes1(module=commonjs).js     |  86 +-
 .../importAttributes2(module=commonjs).js     |  24 +-
 .../reference/importAttributes9.symbols       |   2 +-
 .../reference/importAttributes9.types         |   8 +-
 ...importCallExpressionAsyncES5AMD.errors.txt |  33 -
 .../importCallExpressionAsyncES5AMD.js        |  43 +-
 .../importCallExpressionAsyncES5CJS.js        |  43 +-
 ...ortCallExpressionAsyncES5System.errors.txt |  33 -
 ...importCallExpressionAsyncES5UMD.errors.txt |  33 -
 .../importCallExpressionAsyncES5UMD.js        |  43 +-
 ...importCallExpressionAsyncES6AMD.errors.txt |  33 -
 .../importCallExpressionAsyncES6AMD.js        |  43 +-
 .../importCallExpressionAsyncES6CJS.js        |  43 +-
 ...ortCallExpressionAsyncES6System.errors.txt |  33 -
 ...importCallExpressionAsyncES6UMD.errors.txt |  33 -
 .../importCallExpressionAsyncES6UMD.js        |  43 +-
 .../importCallExpressionCheckReturntype1.js   |  39 +-
 .../importCallExpressionDeclarationEmit1.js   |  43 +-
 .../importCallExpressionES5AMD.errors.txt     |  31 -
 .../reference/importCallExpressionES5AMD.js   |  45 +-
 .../reference/importCallExpressionES5CJS.js   |  45 +-
 .../importCallExpressionES5System.errors.txt  |  31 -
 .../importCallExpressionES5UMD.errors.txt     |  31 -
 .../reference/importCallExpressionES5UMD.js   |  45 +-
 .../importCallExpressionES6AMD.errors.txt     |  31 -
 .../reference/importCallExpressionES6AMD.js   |  45 +-
 .../reference/importCallExpressionES6CJS.js   |  45 +-
 .../importCallExpressionES6System.errors.txt  |  31 -
 .../importCallExpressionES6UMD.errors.txt     |  31 -
 .../reference/importCallExpressionES6UMD.js   |  45 +-
 .../importCallExpressionGrammarError.js       |  41 +-
 .../importCallExpressionInAMD1.errors.txt     |  19 -
 .../reference/importCallExpressionInAMD1.js   |  41 +-
 .../importCallExpressionInAMD2.errors.txt     |  19 -
 .../reference/importCallExpressionInAMD2.js   |  35 +-
 .../importCallExpressionInAMD2.types          |   6 -
 .../importCallExpressionInAMD3.errors.txt     |  16 -
 .../reference/importCallExpressionInAMD3.js   |  35 +-
 .../importCallExpressionInAMD4.errors.txt     |  43 -
 .../reference/importCallExpressionInAMD4.js   |  45 +-
 .../importCallExpressionInAMD4.types          |  17 -
 .../reference/importCallExpressionInCJS1.js   |  41 +-
 .../reference/importCallExpressionInCJS2.js   |  37 +-
 .../reference/importCallExpressionInCJS3.js   |  35 +-
 .../reference/importCallExpressionInCJS4.js   |  35 +-
 .../reference/importCallExpressionInCJS5.js   |  45 +-
 ...CallExpressionInExportEqualsAMD.errors.txt |  11 -
 .../importCallExpressionInExportEqualsAMD.js  |  35 +-
 ...mportCallExpressionInExportEqualsAMD.types |  12 +-
 .../importCallExpressionInExportEqualsCJS.js  |  35 +-
 ...CallExpressionInExportEqualsUMD.errors.txt |  11 -
 .../importCallExpressionInExportEqualsUMD.js  |  35 +-
 ...mportCallExpressionInExportEqualsUMD.types |  12 +-
 .../importCallExpressionInScriptContext1.js   |  35 +-
 .../importCallExpressionInScriptContext2.js   |  35 +-
 .../importCallExpressionInSystem1.errors.txt  |  19 -
 .../importCallExpressionInSystem2.errors.txt  |  19 -
 .../importCallExpressionInSystem2.types       |   6 -
 .../importCallExpressionInSystem3.errors.txt  |  16 -
 .../importCallExpressionInSystem4.errors.txt  |  43 -
 .../importCallExpressionInSystem4.types       |  17 -
 .../importCallExpressionInUMD1.errors.txt     |  19 -
 .../reference/importCallExpressionInUMD1.js   |  41 +-
 .../importCallExpressionInUMD2.errors.txt     |  19 -
 .../reference/importCallExpressionInUMD2.js   |  35 +-
 .../importCallExpressionInUMD2.types          |   6 -
 .../importCallExpressionInUMD3.errors.txt     |  16 -
 .../reference/importCallExpressionInUMD3.js   |  35 +-
 .../importCallExpressionInUMD4.errors.txt     |  43 -
 .../reference/importCallExpressionInUMD4.js   |  45 +-
 .../importCallExpressionInUMD4.types          |  17 -
 .../importCallExpressionInUMD5.errors.txt     |  14 -
 .../reference/importCallExpressionInUMD5.js   |  35 +-
 .../importCallExpressionInUMD5.types          |   2 -
 .../importCallExpressionNestedAMD.errors.txt  |  11 -
 .../importCallExpressionNestedAMD.js          |  35 +-
 .../importCallExpressionNestedAMD.types       |   1 -
 .../importCallExpressionNestedAMD2.errors.txt |  11 -
 .../importCallExpressionNestedAMD2.js         |  37 +-
 .../importCallExpressionNestedAMD2.types      |   1 -
 .../importCallExpressionNestedCJS.js          |  35 +-
 .../importCallExpressionNestedCJS2.js         |  37 +-
 ...mportCallExpressionNestedSystem.errors.txt |  11 -
 .../importCallExpressionNestedSystem.types    |   1 -
 ...portCallExpressionNestedSystem2.errors.txt |  11 -
 .../importCallExpressionNestedSystem2.types   |   1 -
 .../importCallExpressionNestedUMD.errors.txt  |  11 -
 .../importCallExpressionNestedUMD.js          |  35 +-
 .../importCallExpressionNestedUMD.types       |   1 -
 .../importCallExpressionNestedUMD2.errors.txt |  11 -
 .../importCallExpressionNestedUMD2.js         |  37 +-
 .../importCallExpressionNestedUMD2.types      |   1 -
 ...portCallExpressionNoModuleKindSpecified.js |  39 +-
 .../importCallExpressionReturnPromiseOfAny.js |  49 +-
 ...llExpressionSpecifierNotStringTypeError.js |  43 +-
 .../importCallExpressionWithTypeArgument.js   |  37 +-
 .../reference/importDeclWithClassModifiers.js |  16 +-
 .../importDeclWithExportModifier.errors.txt   |   2 -
 .../importDefaultBindingDefer.errors.txt      |  14 -
 .../reference/importDefaultBindingDefer.types |  12 +-
 .../reference/importDeferComments.errors.txt  |  11 -
 .../reference/importDeferComments.types       |   4 +-
 .../importDeferInvalidDefault.errors.txt      |   2 +-
 .../reference/importDeferInvalidDefault.js    |   4 +-
 .../importDeferInvalidDefault.symbols         |   2 +-
 .../reference/importDeferInvalidDefault.types |   2 +-
 .../importDeferInvalidNamed.errors.txt        |   2 +-
 .../reference/importDeferInvalidNamed.js      |   4 +-
 .../reference/importDeferInvalidNamed.symbols |   2 +-
 .../reference/importDeferInvalidNamed.types   |   2 +-
 .../importDeferNamespace(module=commonjs).js  |  35 +-
 .../importDeferTypeConflict1.errors.txt       |   2 +-
 .../reference/importDeferTypeConflict1.js     |   4 +-
 .../importDeferTypeConflict1.symbols          |   2 +-
 .../reference/importDeferTypeConflict1.types  |   6 +-
 .../importDeferTypeConflict2.errors.txt       |   2 +-
 .../reference/importDeferTypeConflict2.js     |   4 +-
 .../importDeferTypeConflict2.symbols          |   2 +-
 .../reference/importDeferTypeConflict2.types  |   6 +-
 tests/baselines/reference/importEquals3.js    |  35 +-
 tests/baselines/reference/importHelpers.js    |   2 +-
 .../baselines/reference/importHelpers.symbols |  52 +-
 tests/baselines/reference/importHelpers.types |   2 +-
 .../reference/importHelpersAmd.errors.txt     |  22 -
 .../reference/importHelpersAmd.types          |  11 -
 .../reference/importHelpersES6.errors.txt     |  26 -
 .../reference/importHelpersES6.types          |  22 -
 .../importHelpersInIsolatedModules.js         |   2 +-
 .../importHelpersInIsolatedModules.symbols    |  46 +-
 .../importHelpersInIsolatedModules.types      |   2 +-
 .../baselines/reference/importHelpersInTsx.js |   2 +-
 .../reference/importHelpersInTsx.symbols      |  46 +-
 .../reference/importHelpersInTsx.types        |   2 +-
 .../importHelpersNoHelpers.errors.txt         |   2 -
 ...persNoHelpersForAsyncGenerators.errors.txt |   2 -
 ...elpersNoHelpersForPrivateFields.errors.txt |   2 -
 .../importHelpersNoModule.errors.txt          |   2 -
 .../reference/importHelpersOutFile.errors.txt |  23 -
 .../reference/importHelpersOutFile.types      |   7 -
 .../reference/importHelpersSystem.errors.txt  |  20 -
 .../reference/importHelpersSystem.types       |   7 -
 ...moduleinterop=false,module=amd).errors.txt |  16 -
 ...As(esmoduleinterop=false,module=amd).types |   1 -
 ...einterop=false,module=commonjs).errors.txt |  14 -
 ...moduleinterop=false,module=commonjs).types |   1 -
 ...uleinterop=false,module=es2015).errors.txt |  14 -
 ...esmoduleinterop=false,module=es2015).types |   1 -
 ...uleinterop=false,module=es2020).errors.txt |  14 -
 ...esmoduleinterop=false,module=es2020).types |   1 -
 ...uleinterop=false,module=system).errors.txt |  16 -
 ...esmoduleinterop=false,module=system).types |   1 -
 ...smoduleinterop=true,module=amd).errors.txt |  14 -
 ...rAs(esmoduleinterop=true,module=amd).types |   1 -
 ...duleinterop=true,module=system).errors.txt |  14 -
 ...(esmoduleinterop=true,module=system).types |   1 -
 ...moduleinterop=false,module=amd).errors.txt |  19 -
 ...lt(esmoduleinterop=false,module=amd).types |   1 -
 ...einterop=false,module=commonjs).errors.txt |  17 -
 ...moduleinterop=false,module=commonjs).types |   1 -
 ...uleinterop=false,module=es2015).errors.txt |  17 -
 ...esmoduleinterop=false,module=es2015).types |   1 -
 ...uleinterop=false,module=es2020).errors.txt |  17 -
 ...esmoduleinterop=false,module=es2020).types |   1 -
 ...uleinterop=false,module=system).errors.txt |  19 -
 ...esmoduleinterop=false,module=system).types |   1 -
 ...smoduleinterop=true,module=amd).errors.txt |  17 -
 ...ult(esmoduleinterop=true,module=amd).types |   1 -
 ...duleinterop=true,module=system).errors.txt |  17 -
 ...(esmoduleinterop=true,module=system).types |   1 -
 ...moduleinterop=false,module=amd).errors.txt |  12 -
 ...einterop=false,module=commonjs).errors.txt |  10 -
 ...uleinterop=false,module=es2015).errors.txt |  10 -
 ...uleinterop=false,module=es2020).errors.txt |  10 -
 ...uleinterop=false,module=system).errors.txt |  12 -
 ...smoduleinterop=true,module=amd).errors.txt |   2 -
 ...duleinterop=true,module=system).errors.txt |  10 -
 ...moduleinterop=false,module=amd).errors.txt |  12 -
 ...einterop=false,module=commonjs).errors.txt |  10 -
 ...uleinterop=false,module=es2015).errors.txt |  10 -
 ...uleinterop=false,module=es2020).errors.txt |  10 -
 ...uleinterop=false,module=system).errors.txt |  12 -
 ...smoduleinterop=true,module=amd).errors.txt |   2 -
 ...duleinterop=true,module=system).errors.txt |  10 -
 ...moduleinterop=false,module=amd).errors.txt |  13 -
 ...einterop=false,module=commonjs).errors.txt |  11 -
 ...uleinterop=false,module=es2015).errors.txt |  11 -
 ...uleinterop=false,module=es2020).errors.txt |  11 -
 ...uleinterop=false,module=system).errors.txt |  13 -
 ...smoduleinterop=true,module=amd).errors.txt |   2 -
 ...duleinterop=true,module=system).errors.txt |  11 -
 ...moduleinterop=false,module=amd).errors.txt |  17 -
 ...As(esmoduleinterop=false,module=amd).types |   1 -
 ...einterop=false,module=commonjs).errors.txt |  15 -
 ...moduleinterop=false,module=commonjs).types |   1 -
 ...uleinterop=false,module=es2015).errors.txt |  15 -
 ...esmoduleinterop=false,module=es2015).types |   1 -
 ...uleinterop=false,module=es2020).errors.txt |  15 -
 ...esmoduleinterop=false,module=es2020).types |   1 -
 ...uleinterop=false,module=system).errors.txt |  17 -
 ...esmoduleinterop=false,module=system).types |   1 -
 ...smoduleinterop=true,module=amd).errors.txt |  15 -
 ...rAs(esmoduleinterop=true,module=amd).types |   1 -
 ...duleinterop=true,module=system).errors.txt |  15 -
 ...(esmoduleinterop=true,module=system).types |   1 -
 ...WithLocalCollisions(module=amd).errors.txt |  23 -
 ...tHelpersWithLocalCollisions(module=amd).js |   2 +-
 ...ersWithLocalCollisions(module=commonjs).js |   2 +-
 ...lpersWithLocalCollisions(module=es2015).js |   2 +-
 ...hLocalCollisions(module=system).errors.txt |  23 -
 ...lpersWithLocalCollisions(module=system).js |   2 +-
 .../importImportOnlyModule.errors.txt         |  18 -
 ...tMeta(module=system,target=es5).errors.txt |   2 -
 ...ta(module=system,target=esnext).errors.txt |   2 -
 ...ortMetaNarrowing(module=system).errors.txt |  11 -
 .../importNonExportedMember10.errors.txt      |   2 -
 .../importNonExportedMember4.errors.txt       |   2 -
 .../importNonExportedMember6.errors.txt       |   2 -
 .../importNonExportedMember8.errors.txt       |   2 -
 .../reference/importNonExternalModule.js      |  13 +-
 .../reference/importNotElidedWhenNotFound.js  |  11 +-
 .../importShadowsGlobalName.errors.txt        |  12 -
 .../importTypeAmdBundleRewrite.errors.txt     |  16 -
 .../reference/importWithTrailingSlash.js      |  14 +-
 ...import_reference-exported-alias.errors.txt |  24 -
 .../import_reference-to-type-alias.errors.txt |  20 -
 ...ecing-aliased-type-throug-array.errors.txt |  18 -
 ...encing-an-imported-module-alias.errors.txt |  12 -
 .../importedAliasesInTypePositions.errors.txt |  21 -
 .../importedModuleClassNameClash.errors.txt   |  11 -
 .../importedModuleClassNameClash.types        |   3 +-
 .../reference/importsImplicitlyReadonly.js    |  35 +-
 .../importsInAmbientModules1.errors.txt       |  11 -
 .../importsInAmbientModules2.errors.txt       |  11 -
 .../importsInAmbientModules3.errors.txt       |  11 -
 .../inferredIndexerOnNamespaceImport.js       |  35 +-
 .../reference/inlineJsxFactoryDeclarations.js |  40 +-
 .../inlineJsxFactoryDeclarationsLocalTypes.js |  35 +-
 ...inlineJsxFactoryLocalTypeGlobalFallback.js |   5 +-
 .../inlineJsxFactoryWithFragmentIsError.js    |  35 +-
 .../instanceOfInExternalModules.errors.txt    |  14 -
 .../instanceOfInExternalModules.types         |   2 -
 .../reference/interfaceDeclaration3.js        | 100 +--
 .../interfaceDeclaration5.errors.txt          |   8 -
 .../reference/interfaceImplementation6.js     |  54 +-
 ...mInsideTopLevelModuleWithExport.errors.txt |  16 -
 ...sideTopLevelModuleWithoutExport.errors.txt |  16 -
 ...nInsideTopLevelModuleWithExport.errors.txt |  15 -
 ...duleInsideLocalModuleWithExport.errors.txt |  16 -
 ...sideTopLevelModuleWithoutExport.errors.txt |  14 -
 ...faceInsideLocalModuleWithExport.errors.txt |  15 -
 ...eInsideLocalModuleWithoutExport.errors.txt |  15 -
 ...sideLocalModuleWithoutExportAccessError.js |  16 +-
 ...sideTopLevelModuleWithoutExport.errors.txt |  13 -
 ...sideLocalModuleWithoutExportAccessError.js |  16 +-
 ...eInsideTopLevelModuleWithExport.errors.txt |  17 -
 ...ModuleInsideTopLevelModuleWithExport.types |   1 -
 ...sVarInsideLocalModuleWithExport.errors.txt |  14 -
 ...rInsideLocalModuleWithoutExport.errors.txt |  14 -
 ...rInsideTopLevelModuleWithExport.errors.txt |  13 -
 ...lidSyntaxNamespaceImportWithAMD.errors.txt |   2 -
 ...nvalidSyntaxNamespaceImportWithCommonjs.js |  35 +-
 ...SyntaxNamespaceImportWithSystem.errors.txt |   2 -
 .../isolatedDeclarationOutFile.errors.txt     |  24 -
 .../isolatedModulesExportDeclarationType.js   |   5 +-
 .../isolatedModulesImportExportElision.js     |  35 +-
 .../isolatedModulesPlainFile-AMD.errors.txt   |   8 -
 ...isolatedModulesPlainFile-System.errors.txt |   8 -
 .../isolatedModulesPlainFile-UMD.errors.txt   |   8 -
 .../reference/isolatedModulesReExportType.js  |  35 +-
 .../reference/jsDeclarationsDefault.js        |   5 +-
 .../reference/jsDeclarationsExportForms.js    | 105 +--
 .../reference/jsDeclarationsExportFormsErr.js |  35 +-
 ...jsDeclarationsImportTypeBundled.errors.txt |  17 -
 .../jsDeclarationsReexportAliases.js          |   7 +-
 ...mpilationRestParamJsDocFunction.errors.txt |  28 -
 ...ileCompilationRestParamJsDocFunction.types |  17 -
 .../baselines/reference/jsdocInTypeScript.js  |  35 +-
 .../jsxCallElaborationCheckNoCrash1.js        |  35 +-
 .../jsxCheckJsxNoTypeArgumentsAllowed.js      |  35 +-
 .../jsxChildrenIndividualErrorElaborations.js |  35 +-
 ...ldConfusableWithMultipleChildrenNoError.js |  35 +-
 .../jsxClassAttributeResolution.errors.txt    |   2 +-
 .../reference/jsxClassAttributeResolution.js  |   2 +-
 ...sxComplexSignatureHasApplicabilityError.js |  35 +-
 tests/baselines/reference/jsxElementType.js   |  35 +-
 .../reference/jsxElementTypeLiteral.js        |  35 +-
 .../jsxElementTypeLiteralWithGeneric.js       |  35 +-
 ...yExpressionNotCountedAsChild(jsx=react).js |  35 +-
 .../jsxExcessPropsAndAssignability.js         |  35 +-
 ...FactoryReference(jsx=react-jsx).errors.txt |   4 +-
 ...toryReference(jsx=react-jsxdev).errors.txt |   4 +-
 .../baselines/reference/jsxHasLiteralType.js  |  35 +-
 ...jsxImportForSideEffectsNonExtantNoError.js |  35 +-
 .../reference/jsxImportInAttribute.js         |   5 +-
 .../jsxIntrinsicElementsCompatability.js      |  35 +-
 .../jsxIntrinsicElementsTypeArgumentErrors.js |  35 +-
 .../baselines/reference/jsxIntrinsicUnions.js |  35 +-
 ...suesErrorWhenTagExpectsTooManyArguments.js |  35 +-
 .../reference/jsxNamespaceReexports.js        |  35 +-
 .../jsxRuntimePragma(jsx=preserve).js         | 111 +--
 .../reference/jsxRuntimePragma(jsx=react).js  | 111 +--
 .../jsxRuntimePragma(jsx=react-jsx).js        | 111 +--
 .../jsxRuntimePragma(jsx=react-jsxdev).js     | 111 +--
 .../reference/jsxSpreadFirstUnionNoErrors.js  |   5 +-
 tests/baselines/reference/jsxViaImport.2.js   |   5 +-
 .../reference/keepImportsInDts1.errors.txt    |   8 -
 .../reference/keepImportsInDts2.errors.txt    |   8 -
 .../reference/keepImportsInDts3.errors.txt    |   9 -
 .../reference/keepImportsInDts4.errors.txt    |   9 -
 .../keyofModuleObjectHasCorrectKeys.js        |  35 +-
 ...larationNoCrash1(module=system).errors.txt |   2 -
 ...lesExportsSpecifierGenerationConditions.js |  35 +-
 ...bReferenceDeclarationEmitBundle.errors.txt |  12 -
 .../libReferenceNoLibBundle.errors.txt        |  20 -
 ...berAccessMustUseModuleInstances.errors.txt |  17 -
 .../reference/mergedDeclarations6.errors.txt  |  25 -
 .../reference/mergedDeclarations6.types       |   5 -
 .../reference/mergedDeclarations7.js          |  35 +-
 .../moduleAliasAsFunctionArgument.errors.txt  |  17 -
 ...onCollidingNamesInAugmentation1.errors.txt |  35 -
 ...ntationCollidingNamesInAugmentation1.types |   6 -
 ...ntationDoesNamespaceEnumMergeOfReexport.js |  35 +-
 .../reference/moduleAugmentationGlobal8.js    |   5 +-
 .../reference/moduleAugmentationGlobal8_1.js  |   5 +-
 ...duleAugmentationsBundledOutput1.errors.txt |  57 --
 .../moduleAugmentationsBundledOutput1.types   |   8 -
 .../moduleAugmentationsImports1.errors.txt    |  45 -
 .../moduleAugmentationsImports2.errors.txt    |  50 --
 .../moduleAugmentationsImports3.errors.txt    |  49 --
 .../reference/moduleAugmentationsImports3.js  |  50 ++
 .../moduleAugmentationsImports4.errors.txt    |  50 --
 .../reference/moduleAugmentationsImports4.js  |  57 ++
 .../reference/moduleExportAliasImported.types |   4 +-
 tests/baselines/reference/moduleExports1.js   |  48 +-
 ...ImportedForTypeArgumentPosition.errors.txt |  14 -
 .../moduleMergeConstructor.errors.txt         |  29 -
 .../reference/moduleMergeConstructor.js       |  34 -
 ...oneDynamicImport(target=es2015).errors.txt |  10 -
 .../moduleNoneDynamicImport(target=es2015).js |  35 +-
 ...oneDynamicImport(target=es2020).errors.txt |  10 -
 .../reference/moduleNoneErrors.errors.txt     |   2 -
 .../reference/moduleNoneOutFile.errors.txt    |   8 -
 .../reference/modulePrologueAMD.errors.txt    |   8 -
 .../reference/modulePrologueSystem.errors.txt |   8 -
 .../reference/modulePrologueUmd.errors.txt    |   8 -
 ...enced-using-absolute-and-relative-names.js |   1 -
 ...ist-on-disk-that-differs-only-in-casing.js |   1 -
 ...program-differ-only-in-casing-(imports).js |   1 -
 ...only-in-casing-(tripleslash-references).js |   1 -
 ...odule=commonjs,moduleresolution=node16).js |  35 +-
 ...ule=commonjs,moduleresolution=nodenext).js |  35 +-
 ...duleResolution_classicPrefersTs.errors.txt |  13 -
 tests/baselines/reference/multiline.js        |  35 +-
 .../reference/multipleDefaultExports01.js     |   5 +-
 .../reference/multipleDefaultExports02.js     |   5 +-
 .../reference/namespaceMemberAccess.js        |  35 +-
 tests/baselines/reference/narrowedImports.js  |  37 +-
 .../nestedRedeclarationInES6AMD.errors.txt    |  11 -
 .../reference/newAbstractInstance2.js         |   5 +-
 .../noBundledEmitFromNodeModules.errors.txt   |   2 -
 .../reference/noCrashOnImportShadowing.js     |  70 +-
 ...eAugmentationInDeclarationFile1.errors.txt |   7 -
 ...eAugmentationInDeclarationFile2.errors.txt |   2 -
 ...eAugmentationInDeclarationFile3.errors.txt |   2 -
 .../noImplicitUseStrict_amd.errors.txt        |   2 -
 .../noImplicitUseStrict_system.errors.txt     |   2 -
 .../noImplicitUseStrict_umd.errors.txt        |   2 -
 .../reference/nodeColonModuleResolution.js    |  35 +-
 .../reference/nodeColonModuleResolution2.js   |  35 +-
 .../reference/objectIndexer.errors.txt        |  20 -
 tests/baselines/reference/objectIndexer.types |   1 -
 .../outFilerootDirModuleNamesAmd.errors.txt   |  15 -
 .../reference/outFilerootDirModuleNamesAmd.js |  40 +-
 ...outFilerootDirModuleNamesSystem.errors.txt |  16 -
 .../reference/outModuleConcatAmd.errors.txt   |  10 -
 .../outModuleConcatSystem.errors.txt          |  10 -
 .../reference/outModuleConcatUmd.errors.txt   |   2 -
 .../outModuleTripleSlashRefs.errors.txt       |  32 -
 ...packageJsonExportsOptionsCompat.errors.txt |   5 +-
 ...ompat(moduleresolution=classic).errors.txt |   2 -
 ...ppingBasedModuleResolution1_amd.errors.txt |   5 +-
 ...gBasedModuleResolution2_classic.errors.txt |   5 +-
 ...gBasedModuleResolution3_classic.errors.txt |   4 -
 ...gBasedModuleResolution4_classic.errors.txt |   8 +-
 ...gBasedModuleResolution5_classic.errors.txt |   5 +-
 ...gBasedModuleResolution6_classic.errors.txt |  25 -
 ...appingBasedModuleResolution6_classic.types |   1 -
 ...gBasedModuleResolution7_classic.errors.txt |   5 +-
 ...gBasedModuleResolution8_classic.errors.txt |   8 +-
 ...aryOperatorsOnExportedVariables.errors.txt |   2 -
 ...ValueImports_module(module=amd).errors.txt |   2 -
 ...ueImports_module(module=system).errors.txt |   2 -
 ...heckAnonymousFunctionParameter2.errors.txt |  19 -
 ...nterfaceMethodWithTypeParameter.errors.txt |  12 -
 ...mentOnExportedGenericInterface2.errors.txt |  18 -
 ...ReferenceInConstructorParameter.errors.txt |  15 -
 .../reference/privacyGetter.errors.txt        | 212 -----
 .../reference/privacyGloFunc.errors.txt       | 535 ------------
 .../baselines/reference/privacyGloFunc.types  |   6 -
 ...nalReferenceImportWithoutExport.errors.txt | 157 ----
 ...ternalModuleImportWithoutExport.errors.txt |   4 +-
 ...mbientExternalModuleImportWithoutExport.js |  80 +-
 ...tExternalModuleImportWithoutExport.symbols |   6 +-
 ...entExternalModuleImportWithoutExport.types |   4 +-
 ...ternalReferenceImportWithExport.errors.txt | 104 ---
 ...nalReferenceImportWithoutExport.errors.txt | 104 ---
 .../privateNameEmitHelpers.errors.txt         |   2 +-
 .../reference/privateNameEmitHelpers.js       |   2 +-
 .../reference/privateNameEmitHelpers.symbols  |  34 +-
 .../reference/privateNameEmitHelpers.types    |   2 +-
 .../privateNameStaticEmitHelpers.errors.txt   |   2 +-
 .../reference/privateNameStaticEmitHelpers.js |   2 +-
 .../privateNameStaticEmitHelpers.symbols      |  34 +-
 .../privateNameStaticEmitHelpers.types        |   2 +-
 .../privatePropertyUsingObjectType.errors.txt |  14 -
 .../project/baseline/amd/baseline.errors.txt  |  14 -
 .../project/baseline/node/baseline.errors.txt |  12 -
 .../baseline2/amd/baseline2.errors.txt        |  14 -
 .../baseline2/node/baseline2.errors.txt       |  12 -
 .../baseline3/amd/baseline3.errors.txt        |  13 -
 .../baseline3/node/baseline3.errors.txt       |  11 -
 .../amd/cantFindTheModule.errors.txt          |   4 -
 .../node/cantFindTheModule.errors.txt         |   2 -
 .../amd/circularReferencing.errors.txt        |  16 -
 .../node/circularReferencing.errors.txt       |  14 -
 .../amd/circularReferencing2.errors.txt       |  30 -
 .../node/circularReferencing2.errors.txt      |  28 -
 .../amd/declarationDir.errors.txt             |  21 -
 .../node/declarationDir.errors.txt            |  19 -
 .../amd/declarationDir2.errors.txt            |  21 -
 .../node/declarationDir2.errors.txt           |  19 -
 .../amd/declarationDir3.errors.txt            |   4 -
 .../node/declarationDir3.errors.txt           |   2 -
 .../declarationsCascadingImports.errors.txt   |  30 -
 .../declarationsCascadingImports.errors.txt   |  28 -
 .../declarationsExportNamespace.errors.txt    |  17 -
 .../declarationsExportNamespace.errors.txt    |  15 -
 .../amd/declarationsGlobalImport.errors.txt   |  21 -
 .../node/declarationsGlobalImport.errors.txt  |  19 -
 .../declarationsImportedInPrivate.errors.txt  |  26 -
 .../declarationsImportedInPrivate.errors.txt  |  24 -
 ...clarationsImportedUseInFunction.errors.txt |  19 -
 ...clarationsImportedUseInFunction.errors.txt |  17 -
 ...directImportShouldResultInError.errors.txt |  28 -
 ...directImportShouldResultInError.errors.txt |  26 -
 ...declarationsMultipleTimesImport.errors.txt |  35 -
 ...declarationsMultipleTimesImport.errors.txt |  33 -
 ...ionsMultipleTimesMultipleImport.errors.txt |  38 -
 ...ionsMultipleTimesMultipleImport.errors.txt |  36 -
 .../amd/declarationsSimpleImport.errors.txt   |  29 -
 .../node/declarationsSimpleImport.errors.txt  |  27 -
 .../amd/declareExportAdded.errors.txt         |  16 -
 .../node/declareExportAdded.errors.txt        |  14 -
 .../amd/declareVariableCollision.errors.txt   |   4 -
 .../node/declareVariableCollision.errors.txt  |   2 -
 ...aultExcludeNodeModulesAndOutDir.errors.txt |  17 -
 ...aultExcludeNodeModulesAndOutDir.errors.txt |  14 -
 ...NodeModulesAndOutDirWithAllowJS.errors.txt |  17 -
 ...NodeModulesAndOutDirWithAllowJS.errors.txt |  14 -
 ...odeModulesAndRelativePathOutDir.errors.txt |  17 -
 ...odeModulesAndRelativePathOutDir.errors.txt |  14 -
 ...ndRelativePathOutDirWithAllowJS.errors.txt |  17 -
 ...ndRelativePathOutDirWithAllowJS.errors.txt |  14 -
 .../defaultExcludeOnlyNodeModules.errors.txt  |  16 -
 .../defaultExcludeOnlyNodeModules.errors.txt  |  13 -
 ...MetadataCommonJSISolatedModules.errors.txt |   8 +-
 .../amd/main.js                               |  34 -
 ...MetadataCommonJSISolatedModules.errors.txt |   5 +-
 .../node/main.js                              |  35 +-
 ...ommonJSISolatedModulesNoResolve.errors.txt |   8 +-
 .../amd/main.js                               |  34 -
 ...ommonJSISolatedModulesNoResolve.errors.txt |   5 +-
 .../node/main.js                              |  35 +-
 .../emitDecoratorMetadataSystemJS.errors.txt  |   8 +-
 .../emitDecoratorMetadataSystemJS/amd/main.js |  34 -
 .../emitDecoratorMetadataSystemJS.errors.txt  |   5 +-
 .../node/main.js                              |  35 +-
 ...MetadataSystemJSISolatedModules.errors.txt |   8 +-
 .../amd/main.js                               |  34 -
 ...MetadataSystemJSISolatedModules.errors.txt |   5 +-
 .../node/main.js                              |  35 +-
 ...ystemJSISolatedModulesNoResolve.errors.txt |   8 +-
 .../amd/main.js                               |  34 -
 ...ystemJSISolatedModulesNoResolve.errors.txt |   5 +-
 .../node/main.js                              |  35 +-
 .../amd/extReferencingExtAndInt.errors.txt    |  20 -
 .../node/extReferencingExtAndInt.errors.txt   |  18 -
 .../amd/intReferencingExtAndInt.errors.txt    |   4 -
 .../node/intReferencingExtAndInt.errors.txt   |   2 -
 .../amd/invalidRootFile.errors.txt            |   4 -
 .../node/invalidRootFile.errors.txt           |   2 -
 ...ationDifferentNamesNotSpecified.errors.txt |  15 -
 ...ationDifferentNamesNotSpecified.errors.txt |   5 +-
 ...entNamesNotSpecifiedWithAllowJs.errors.txt |  20 -
 ...entNamesNotSpecifiedWithAllowJs.errors.txt |   5 +-
 ...pilationDifferentNamesSpecified.errors.txt |   8 +-
 ...pilationDifferentNamesSpecified.errors.txt |   5 +-
 ...ferentNamesSpecifiedWithAllowJs.errors.txt |  21 -
 ...ferentNamesSpecifiedWithAllowJs.errors.txt |   5 +-
 ...CompilationSameNameDTsSpecified.errors.txt |  10 -
 ...CompilationSameNameDTsSpecified.errors.txt |   8 -
 ...SameNameDTsSpecifiedWithAllowJs.errors.txt |  15 -
 ...SameNameDTsSpecifiedWithAllowJs.errors.txt |  12 -
 ...pilationSameNameDtsNotSpecified.errors.txt |  10 -
 ...pilationSameNameDtsNotSpecified.errors.txt |   8 -
 ...eNameDtsNotSpecifiedWithAllowJs.errors.txt |   8 +-
 ...eNameDtsNotSpecifiedWithAllowJs.errors.txt |   5 +-
 ...lationSameNameFilesNotSpecified.errors.txt |  10 -
 ...lationSameNameFilesNotSpecified.errors.txt |   8 -
 ...ameFilesNotSpecifiedWithAllowJs.errors.txt |  12 -
 ...ameFilesNotSpecifiedWithAllowJs.errors.txt |   9 -
 ...mpilationSameNameFilesSpecified.errors.txt |  10 -
 ...mpilationSameNameFilesSpecified.errors.txt |   8 -
 ...meNameFilesSpecifiedWithAllowJs.errors.txt |  15 -
 ...meNameFilesSpecifiedWithAllowJs.errors.txt |  12 -
 ...olutePathMixedSubfolderNoOutdir.errors.txt |  38 -
 ...olutePathMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...tePathModuleMultifolderNoOutdir.errors.txt |  41 -
 ...tePathModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...bsolutePathModuleSimpleNoOutdir.errors.txt |  29 -
 ...bsolutePathModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...lutePathModuleSubfolderNoOutdir.errors.txt |  29 -
 ...lutePathModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...AbsolutePathMultifolderNoOutdir.errors.txt |  38 -
 ...AbsolutePathMultifolderNoOutdir.errors.txt |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...athMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...athMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...pRootAbsolutePathSimpleNoOutdir.errors.txt |  27 -
 ...pRootAbsolutePathSimpleNoOutdir.errors.txt |  25 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...lutePathSimpleSpecifyOutputFile.errors.txt |  27 -
 ...lutePathSimpleSpecifyOutputFile.errors.txt |   2 -
 ...tAbsolutePathSingleFileNoOutdir.errors.txt |  16 -
 ...tAbsolutePathSingleFileNoOutdir.errors.txt |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |   2 -
 ...otAbsolutePathSubfolderNoOutdir.errors.txt |  27 -
 ...otAbsolutePathSubfolderNoOutdir.errors.txt |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ativePathMixedSubfolderNoOutdir.errors.txt |  38 -
 ...ativePathMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...vePathModuleMultifolderNoOutdir.errors.txt |  41 -
 ...vePathModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...elativePathModuleSimpleNoOutdir.errors.txt |  29 -
 ...elativePathModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...tivePathModuleSubfolderNoOutdir.errors.txt |  29 -
 ...tivePathModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...RelativePathMultifolderNoOutdir.errors.txt |  38 -
 ...RelativePathMultifolderNoOutdir.errors.txt |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...athMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...athMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...pRootRelativePathSimpleNoOutdir.errors.txt |  27 -
 ...pRootRelativePathSimpleNoOutdir.errors.txt |  25 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...tivePathSimpleSpecifyOutputFile.errors.txt |  27 -
 ...tivePathSimpleSpecifyOutputFile.errors.txt |   2 -
 ...tRelativePathSingleFileNoOutdir.errors.txt |  16 -
 ...tRelativePathSingleFileNoOutdir.errors.txt |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |   2 -
 ...otRelativePathSubfolderNoOutdir.errors.txt |  27 -
 ...otRelativePathSubfolderNoOutdir.errors.txt |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...SourceRootWithNoSourceMapOption.errors.txt |   4 -
 ...SourceRootWithNoSourceMapOption.errors.txt |   2 -
 .../mapRootWithNoSourceMapOption.errors.txt   |   4 -
 .../mapRootWithNoSourceMapOption.errors.txt   |   2 -
 ...aprootUrlMixedSubfolderNoOutdir.errors.txt |  38 -
 ...aprootUrlMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...ootUrlModuleMultifolderNoOutdir.errors.txt |  41 -
 ...ootUrlModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../maprootUrlModuleSimpleNoOutdir.errors.txt |  29 -
 .../maprootUrlModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...prootUrlModuleSubfolderNoOutdir.errors.txt |  29 -
 ...prootUrlModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 .../maprootUrlMultifolderNoOutdir.errors.txt  |  38 -
 .../maprootUrlMultifolderNoOutdir.errors.txt  |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...UrlMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...UrlMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../amd/maprootUrlSimpleNoOutdir.errors.txt   |  27 -
 .../node/maprootUrlSimpleNoOutdir.errors.txt  |  25 -
 ...UrlSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...UrlSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...prootUrlSimpleSpecifyOutputFile.errors.txt |  27 -
 ...prootUrlSimpleSpecifyOutputFile.errors.txt |   2 -
 .../maprootUrlSingleFileNoOutdir.errors.txt   |  16 -
 .../maprootUrlSingleFileNoOutdir.errors.txt   |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |   2 -
 .../maprootUrlSubfolderNoOutdir.errors.txt    |  27 -
 .../maprootUrlSubfolderNoOutdir.errors.txt    |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...cerootUrlMixedSubfolderNoOutdir.errors.txt |  38 -
 ...cerootUrlMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...ootUrlModuleMultifolderNoOutdir.errors.txt |  41 -
 ...ootUrlModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...urcerootUrlModuleSimpleNoOutdir.errors.txt |  29 -
 ...urcerootUrlModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...erootUrlModuleSubfolderNoOutdir.errors.txt |  29 -
 ...erootUrlModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ourcerootUrlMultifolderNoOutdir.errors.txt |  38 -
 ...ourcerootUrlMultifolderNoOutdir.errors.txt |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...UrlMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...UrlMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...tUrlsourcerootUrlSimpleNoOutdir.errors.txt |  27 -
 ...tUrlsourcerootUrlSimpleNoOutdir.errors.txt |  25 -
 ...UrlSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...UrlSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...erootUrlSimpleSpecifyOutputFile.errors.txt |  27 -
 ...erootUrlSimpleSpecifyOutputFile.errors.txt |   2 -
 ...sourcerootUrlSingleFileNoOutdir.errors.txt |  16 -
 ...sourcerootUrlSingleFileNoOutdir.errors.txt |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |   2 -
 ...lsourcerootUrlSubfolderNoOutdir.errors.txt |  27 -
 ...lsourcerootUrlSubfolderNoOutdir.errors.txt |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |   2 -
 .../amd/moduleIdentifier.errors.txt           |  15 -
 .../node/moduleIdentifier.errors.txt          |  13 -
 .../amd/moduleMergingOrdering1.errors.txt     |  29 -
 .../node/moduleMergingOrdering1.errors.txt    |  27 -
 .../amd/moduleMergingOrdering2.errors.txt     |  29 -
 .../node/moduleMergingOrdering2.errors.txt    |  27 -
 .../multipleLevelsModuleResolution.errors.txt |  43 -
 .../multipleLevelsModuleResolution.errors.txt |  41 -
 .../amd/nestedDeclare.errors.txt              |  17 -
 .../node/nestedDeclare.errors.txt             |  15 -
 .../nestedLocalModuleSimpleCase.errors.txt    |   4 -
 .../nestedLocalModuleSimpleCase.errors.txt    |   2 -
 ...calModuleWithRecursiveTypecheck.errors.txt |   4 -
 ...calModuleWithRecursiveTypecheck.errors.txt |   2 -
 .../amd/nestedReferenceTags.errors.txt        |  27 -
 .../node/nestedReferenceTags.errors.txt       |  25 -
 .../noProjectOptionAndInputFiles.errors.txt   |  10 -
 .../noProjectOptionAndInputFiles.errors.txt   |   8 -
 .../amd/importHigher/root.js                  |  34 -
 .../amd/nodeModulesImportHigher.errors.txt    |   5 +-
 .../node/importHigher/root.js                 |  35 +-
 .../amd/maxDepthExceeded/built/root.js        |  34 -
 .../nodeModulesMaxDepthExceeded.errors.txt    |   5 +-
 .../node/maxDepthExceeded/built/root.js       |  35 +-
 .../amd/maxDepthIncreased/root.js             |  35 -
 .../nodeModulesMaxDepthIncreased.errors.txt   |   5 +-
 .../node/maxDepthIncreased/root.js            |  37 +-
 .../nonRelative/amd/nonRelative.errors.txt    |  35 -
 .../nonRelative/node/nonRelative.errors.txt   |  33 -
 .../amd/outMixedSubfolderNoOutdir.errors.txt  |  38 -
 .../node/outMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 .../outModuleMultifolderNoOutdir.errors.txt   |  41 -
 .../outModuleMultifolderNoOutdir.errors.txt   |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../amd/outModuleSimpleNoOutdir.errors.txt    |  29 -
 .../node/outModuleSimpleNoOutdir.errors.txt   |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...utModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...utModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 .../amd/outModuleSubfolderNoOutdir.errors.txt |  29 -
 .../outModuleSubfolderNoOutdir.errors.txt     |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 .../amd/outMultifolderNoOutdir.errors.txt     |  38 -
 .../node/outMultifolderNoOutdir.errors.txt    |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...outMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...outMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../amd/outSimpleNoOutdir.errors.txt          |  27 -
 .../node/outSimpleNoOutdir.errors.txt         |  25 -
 ...outSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...outSimpleSpecifyOutputDirectory.errors.txt |  25 -
 .../amd/outSimpleSpecifyOutputFile.errors.txt |  27 -
 .../outSimpleSpecifyOutputFile.errors.txt     |   2 -
 .../amd/outSingleFileNoOutdir.errors.txt      |  16 -
 .../node/outSingleFileNoOutdir.errors.txt     |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 .../outSingleFileSpecifyOutputFile.errors.txt |  16 -
 .../outSingleFileSpecifyOutputFile.errors.txt |   2 -
 .../amd/outSubfolderNoOutdir.errors.txt       |  27 -
 .../node/outSubfolderNoOutdir.errors.txt      |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 .../outSubfolderSpecifyOutputFile.errors.txt  |  27 -
 .../outSubfolderSpecifyOutputFile.errors.txt  |   2 -
 ...dModuleDeclarationsInsideModule.errors.txt |   4 -
 ...dModuleDeclarationsInsideModule.errors.txt |   2 -
 ...arationsInsideNonExportedModule.errors.txt |   4 -
 ...arationsInsideNonExportedModule.errors.txt |   2 -
 ...leImportStatementInParentModule.errors.txt |   4 -
 ...leImportStatementInParentModule.errors.txt |   2 -
 ...OnImportedModuleSimpleReference.errors.txt |  66 --
 ...OnImportedModuleSimpleReference.errors.txt |  64 --
 ...IndirectTypeFromTheExternalType.errors.txt |  16 -
 ...IndirectTypeFromTheExternalType.errors.txt |  14 -
 .../amd/projectOptionTest.errors.txt          |  10 -
 .../node/projectOptionTest.errors.txt         |   8 -
 .../prologueEmit/amd/prologueEmit.errors.txt  |  16 -
 .../prologueEmit/node/prologueEmit.errors.txt |   2 -
 .../quotesInFileAndDirectoryNames.errors.txt  |  18 -
 .../quotesInFileAndDirectoryNames.errors.txt  |  16 -
 .../amd/referencePathStatic.errors.txt        |  15 -
 .../node/referencePathStatic.errors.txt       |  13 -
 ...eferenceResolutionRelativePaths.errors.txt |  16 -
 ...eferenceResolutionRelativePaths.errors.txt |  14 -
 ...nRelativePathsFromRootDirectory.errors.txt |  16 -
 ...nRelativePathsFromRootDirectory.errors.txt |  14 -
 ...esolutionRelativePathsNoResolve.errors.txt |  16 -
 ...esolutionRelativePathsNoResolve.errors.txt |  14 -
 ...ivePathsRelativeToRootDirectory.errors.txt |  16 -
 ...ivePathsRelativeToRootDirectory.errors.txt |  14 -
 ...eferenceResolutionSameFileTwice.errors.txt |   9 -
 ...eferenceResolutionSameFileTwice.errors.txt |   7 -
 ...esolutionSameFileTwiceNoResolve.errors.txt |   9 -
 ...esolutionSameFileTwiceNoResolve.errors.txt |   7 -
 .../amd/relativeGlobal.errors.txt             |  20 -
 .../node/relativeGlobal.errors.txt            |  18 -
 .../amd/relativeGlobalRef.errors.txt          |  21 -
 .../node/relativeGlobalRef.errors.txt         |  19 -
 .../amd/relativeNested.errors.txt             |  31 -
 .../node/relativeNested.errors.txt            |  29 -
 .../amd/relativeNestedRef.errors.txt          |  21 -
 .../node/relativeNestedRef.errors.txt         |  19 -
 .../amd/relativePaths.errors.txt              |  20 -
 .../node/relativePaths.errors.txt             |  18 -
 .../amd/rootDirectory.errors.txt              |  16 -
 .../node/rootDirectory.errors.txt             |  14 -
 .../amd/rootDirectoryErrors.errors.txt        |   4 -
 .../node/rootDirectoryErrors.errors.txt       |   2 -
 .../rootDirectoryWithSourceRoot.errors.txt    |  16 -
 .../rootDirectoryWithSourceRoot.errors.txt    |  14 -
 .../amd/rootDirectoryWithoutOutDir.errors.txt |   4 -
 .../rootDirectoryWithoutOutDir.errors.txt     |   2 -
 ...olutePathMixedSubfolderNoOutdir.errors.txt |  38 -
 ...olutePathMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...tePathModuleMultifolderNoOutdir.errors.txt |  41 -
 ...tePathModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...bsolutePathModuleSimpleNoOutdir.errors.txt |  29 -
 ...bsolutePathModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...lutePathModuleSubfolderNoOutdir.errors.txt |  29 -
 ...lutePathModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...AbsolutePathMultifolderNoOutdir.errors.txt |  38 -
 ...AbsolutePathMultifolderNoOutdir.errors.txt |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...athMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...athMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...eRootAbsolutePathSimpleNoOutdir.errors.txt |  27 -
 ...eRootAbsolutePathSimpleNoOutdir.errors.txt |  25 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...lutePathSimpleSpecifyOutputFile.errors.txt |  27 -
 ...lutePathSimpleSpecifyOutputFile.errors.txt |   2 -
 ...tAbsolutePathSingleFileNoOutdir.errors.txt |  16 -
 ...tAbsolutePathSingleFileNoOutdir.errors.txt |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |   2 -
 ...otAbsolutePathSubfolderNoOutdir.errors.txt |  27 -
 ...otAbsolutePathSubfolderNoOutdir.errors.txt |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ativePathMixedSubfolderNoOutdir.errors.txt |  38 -
 ...ativePathMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...vePathModuleMultifolderNoOutdir.errors.txt |  41 -
 ...vePathModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...elativePathModuleSimpleNoOutdir.errors.txt |  29 -
 ...elativePathModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...thModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...tivePathModuleSubfolderNoOutdir.errors.txt |  29 -
 ...tivePathModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...RelativePathMultifolderNoOutdir.errors.txt |  38 -
 ...RelativePathMultifolderNoOutdir.errors.txt |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...athMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...athMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...eRootRelativePathSimpleNoOutdir.errors.txt |  27 -
 ...eRootRelativePathSimpleNoOutdir.errors.txt |  25 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...athSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...tivePathSimpleSpecifyOutputFile.errors.txt |  27 -
 ...tivePathSimpleSpecifyOutputFile.errors.txt |   2 -
 ...tRelativePathSingleFileNoOutdir.errors.txt |  16 -
 ...tRelativePathSingleFileNoOutdir.errors.txt |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...PathSingleFileSpecifyOutputFile.errors.txt |   2 -
 ...otRelativePathSubfolderNoOutdir.errors.txt |  27 -
 ...otRelativePathSubfolderNoOutdir.errors.txt |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...ePathSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...sourceRootWithNoSourceMapOption.errors.txt |   4 -
 ...sourceRootWithNoSourceMapOption.errors.txt |   2 -
 ...sourcemapMixedSubfolderNoOutdir.errors.txt |  38 -
 ...sourcemapMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...rcemapModuleMultifolderNoOutdir.errors.txt |  41 -
 ...rcemapModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../sourcemapModuleSimpleNoOutdir.errors.txt  |  29 -
 .../sourcemapModuleSimpleNoOutdir.errors.txt  |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...apModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...apModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...ourcemapModuleSubfolderNoOutdir.errors.txt |  29 -
 ...ourcemapModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 .../sourcemapMultifolderNoOutdir.errors.txt   |  38 -
 .../sourcemapMultifolderNoOutdir.errors.txt   |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...mapMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...mapMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../amd/sourcemapSimpleNoOutdir.errors.txt    |  27 -
 .../node/sourcemapSimpleNoOutdir.errors.txt   |  25 -
 ...mapSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...mapSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...ourcemapSimpleSpecifyOutputFile.errors.txt |  27 -
 ...ourcemapSimpleSpecifyOutputFile.errors.txt |   2 -
 .../sourcemapSingleFileNoOutdir.errors.txt    |  16 -
 .../sourcemapSingleFileNoOutdir.errors.txt    |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...emapSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...emapSingleFileSpecifyOutputFile.errors.txt |   2 -
 .../amd/sourcemapSubfolderNoOutdir.errors.txt |  27 -
 .../sourcemapSubfolderNoOutdir.errors.txt     |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...cemapSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...cemapSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...cerootUrlMixedSubfolderNoOutdir.errors.txt |  38 -
 ...cerootUrlMixedSubfolderNoOutdir.errors.txt |  36 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  38 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  36 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |  38 -
 ...MixedSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |  38 -
 ...ifyOutputFileAndOutputDirectory.errors.txt |   2 -
 ...ootUrlModuleMultifolderNoOutdir.errors.txt |  41 -
 ...ootUrlModuleMultifolderNoOutdir.errors.txt |  39 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  41 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  39 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |  41 -
 ...uleMultifolderSpecifyOutputFile.errors.txt |   2 -
 ...urcerootUrlModuleSimpleNoOutdir.errors.txt |  29 -
 ...urcerootUrlModuleSimpleNoOutdir.errors.txt |  27 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  29 -
 ...uleSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |  29 -
 ...rlModuleSimpleSpecifyOutputFile.errors.txt |   2 -
 ...erootUrlModuleSubfolderNoOutdir.errors.txt |  29 -
 ...erootUrlModuleSubfolderNoOutdir.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  29 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |  29 -
 ...oduleSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...ourcerootUrlMultifolderNoOutdir.errors.txt |  38 -
 ...ourcerootUrlMultifolderNoOutdir.errors.txt |  36 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  38 -
 ...ltifolderSpecifyOutputDirectory.errors.txt |  36 -
 ...UrlMultifolderSpecifyOutputFile.errors.txt |  38 -
 ...UrlMultifolderSpecifyOutputFile.errors.txt |   2 -
 .../sourcerootUrlSimpleNoOutdir.errors.txt    |  27 -
 .../sourcerootUrlSimpleNoOutdir.errors.txt    |  25 -
 ...UrlSimpleSpecifyOutputDirectory.errors.txt |  27 -
 ...UrlSimpleSpecifyOutputDirectory.errors.txt |  25 -
 ...erootUrlSimpleSpecifyOutputFile.errors.txt |  27 -
 ...erootUrlSimpleSpecifyOutputFile.errors.txt |   2 -
 ...sourcerootUrlSingleFileNoOutdir.errors.txt |  16 -
 ...sourcerootUrlSingleFileNoOutdir.errors.txt |  14 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  16 -
 ...ingleFileSpecifyOutputDirectory.errors.txt |  14 -
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |  16 -
 ...tUrlSingleFileSpecifyOutputFile.errors.txt |   2 -
 .../sourcerootUrlSubfolderNoOutdir.errors.txt |  27 -
 .../sourcerootUrlSubfolderNoOutdir.errors.txt |  25 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  27 -
 ...SubfolderSpecifyOutputDirectory.errors.txt |  25 -
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |  27 -
 ...otUrlSubfolderSpecifyOutputFile.errors.txt |   2 -
 ...specifyExcludeUsingRelativepath.errors.txt |  21 -
 ...specifyExcludeUsingRelativepath.errors.txt |  18 -
 ...udeUsingRelativepathWithAllowJS.errors.txt |  21 -
 ...udeUsingRelativepathWithAllowJS.errors.txt |  18 -
 ...ExcludeWithOutUsingRelativePath.errors.txt |  21 -
 ...ExcludeWithOutUsingRelativePath.errors.txt |  18 -
 ...OutUsingRelativePathWithAllowJS.errors.txt |  21 -
 ...OutUsingRelativePathWithAllowJS.errors.txt |  18 -
 ...sibilityOfTypeUsedAcrossModules.errors.txt |  39 -
 ...sibilityOfTypeUsedAcrossModules.errors.txt |  37 -
 ...ibilityOfTypeUsedAcrossModules2.errors.txt |   4 -
 ...ibilityOfTypeUsedAcrossModules2.errors.txt |   2 -
 .../reference/propTypeValidatorInference.js   |  35 +-
 .../propertyIdentityWithPrivacyMismatch.js    |  34 +-
 .../reference/reExportDefaultExport.js        |   5 +-
 tests/baselines/reference/reExportJsFromTs.js |  35 +-
 .../reactNamespaceImportPresevation.js        |  35 +-
 .../reactReadonlyHOCAssignabilityReal.js      |  35 +-
 .../reactSFCAndFunctionResolvable.js          |  35 +-
 .../reactTagNameComponentWithPropsNoOOM.js    |  35 +-
 .../reactTagNameComponentWithPropsNoOOM2.js   |  35 +-
 ...eactTransitiveImportHasValidDeclaration.js |   5 +-
 ...rtAssignmentAndFindAliasedType1.errors.txt |   2 +-
 ...siveExportAssignmentAndFindAliasedType1.js |  24 +-
 ...xportAssignmentAndFindAliasedType1.symbols |   2 +-
 ...eExportAssignmentAndFindAliasedType1.types |   2 +-
 ...rtAssignmentAndFindAliasedType2.errors.txt |   2 +-
 ...siveExportAssignmentAndFindAliasedType2.js |  24 +-
 ...xportAssignmentAndFindAliasedType2.symbols |   2 +-
 ...eExportAssignmentAndFindAliasedType2.types |   2 +-
 ...rtAssignmentAndFindAliasedType3.errors.txt |   2 +-
 ...siveExportAssignmentAndFindAliasedType3.js |  24 +-
 ...xportAssignmentAndFindAliasedType3.symbols |   2 +-
 ...eExportAssignmentAndFindAliasedType3.types |   2 +-
 ...rtAssignmentAndFindAliasedType4.errors.txt |   8 +-
 ...siveExportAssignmentAndFindAliasedType4.js |  35 +-
 ...xportAssignmentAndFindAliasedType4.symbols |  10 +-
 ...eExportAssignmentAndFindAliasedType4.types |   6 +-
 ...rtAssignmentAndFindAliasedType5.errors.txt |  10 +-
 ...siveExportAssignmentAndFindAliasedType5.js |  44 +-
 ...xportAssignmentAndFindAliasedType5.symbols |  12 +-
 ...eExportAssignmentAndFindAliasedType5.types |   8 +-
 ...rtAssignmentAndFindAliasedType6.errors.txt |  12 +-
 ...siveExportAssignmentAndFindAliasedType6.js |  53 +-
 ...xportAssignmentAndFindAliasedType6.symbols |  14 +-
 ...eExportAssignmentAndFindAliasedType6.types |  10 +-
 ...siveExportAssignmentAndFindAliasedType7.js |  55 +-
 ...xportAssignmentAndFindAliasedType7.symbols |  14 +-
 ...eExportAssignmentAndFindAliasedType7.types |  10 +-
 .../reference/reexportMissingDefault.js       |   5 +-
 .../reference/reexportMissingDefault2.js      |   5 +-
 .../reference/reexportMissingDefault3.js      |   5 +-
 .../reference/reexportMissingDefault4.js      |   5 +-
 .../reexportMissingDefault5.errors.txt        |  11 -
 .../reference/reexportMissingDefault6.js      |   5 +-
 ...elativeNamesInClassicResolution.errors.txt |   2 -
 .../relativePathToDeclarationFile.errors.txt  |  29 -
 .../requireAsFunctionInExternalModule.js      |  35 +-
 .../reference/requireEmitSemicolon.errors.txt |  22 -
 .../requireOfJsonFileWithAmd.errors.txt       |   2 -
 ...ireOfJsonFileWithModuleEmitNone.errors.txt |   2 -
 ...WithModuleNodeResolutionEmitAmd.errors.txt |   2 -
 ...uleNodeResolutionEmitAmdOutFile.errors.txt |   2 -
 ...ithModuleNodeResolutionEmitNone.errors.txt |   2 -
 ...hModuleNodeResolutionEmitSystem.errors.txt |   2 -
 ...WithModuleNodeResolutionEmitUmd.errors.txt |   2 -
 ...Type1(moduleresolution=classic).errors.txt |   2 -
 ...port1(moduleresolution=classic).errors.txt |   2 -
 ...PredicateIsInstantiateInContextOfTarget.js |  35 +-
 .../change-affects-imports.js                 |  28 +-
 .../redirect-previous-duplicate-packages.js   |   3 +-
 ...eFileByPath-previous-duplicate-packages.js |   3 +-
 .../resolution-cache-follows-imports.js       | 121 +--
 ...-an-ambient-external-module-declaration.js | 188 +----
 ...le-declarations-from-non-modified-files.js | 785 +++++------------
 .../works-with-updated-SourceFiles.js         | 188 +----
 .../scopedPackagesClassic.errors.txt          |  10 -
 .../selfReferentialDefaultNoStackOverflow.js  |   5 +-
 .../shorthand-property-es5-es6.errors.txt     |   4 +-
 .../shorthand-property-es6-amd.errors.txt     |   2 -
 .../shorthand-property-es6-es6.errors.txt     |   4 +-
 ...ceMapValidationExportAssignment.errors.txt |   9 -
 .../sourceMapValidationExportAssignment.types |   1 -
 .../spellingSuggestionJSXAttribute.js         |  35 +-
 ...adExpressionContextualTypeWithNamespace.js |  35 +-
 .../spreadUnionPropOverride.errors.txt        |  81 --
 .../reference/spreadUnionPropOverride.js      | 100 ---
 .../reference/spreadUnionPropOverride.symbols | 172 ----
 .../reference/spreadUnionPropOverride.types   | 319 -------
 .../reference/stackDepthLimitCastingType.js   |  35 +-
 .../staticInstanceResolution5.errors.txt      |   2 +-
 .../reference/staticInstanceResolution5.js    |  42 +-
 .../staticInstanceResolution5.symbols         |   2 +-
 .../reference/staticInstanceResolution5.types |   2 +-
 ...rictModeWordInImportDeclaration.errors.txt |  12 +-
 ...iesNoDirectLinkGeneratesNonrelativeName.js |  35 +-
 ...ectLinkOptionalGeneratesNonrelativeName.js |  35 +-
 ...oDirectLinkPeerGeneratesNonrelativeName.js |  35 +-
 ...efaultExportsWithDynamicImports.errors.txt |   2 -
 ...temDefaultExportCommentValidity.errors.txt |   9 -
 .../systemDefaultImportCallable.errors.txt    |  18 -
 .../systemExportAssignment.errors.txt         |  11 -
 .../systemExportAssignment2.errors.txt        |   2 -
 .../systemExportAssignment3.errors.txt        |  13 -
 .../systemJsForInNoException.errors.txt       |   8 -
 .../reference/systemJsForInNoException.types  |   3 +-
 .../reference/systemModule1.errors.txt        |   6 -
 .../reference/systemModule10.errors.txt       |   2 -
 .../reference/systemModule10_ES5.errors.txt   |   2 -
 .../reference/systemModule11.errors.txt       |   2 -
 .../reference/systemModule12.errors.txt       |   2 -
 .../reference/systemModule13.errors.txt       |   8 -
 .../reference/systemModule14.errors.txt       |   2 -
 .../reference/systemModule15.errors.txt       |  31 -
 .../baselines/reference/systemModule15.types  |   1 -
 .../reference/systemModule16.errors.txt       |   2 -
 .../reference/systemModule17.errors.txt       |  41 -
 .../reference/systemModule18.errors.txt       |  12 -
 .../reference/systemModule2.errors.txt        |   2 -
 .../reference/systemModule3.errors.txt        |  15 -
 .../reference/systemModule4.errors.txt        |   7 -
 tests/baselines/reference/systemModule4.types |   1 -
 .../reference/systemModule5.errors.txt        |   7 -
 .../reference/systemModule6.errors.txt        |  10 -
 .../reference/systemModule7.errors.txt        |  14 -
 .../reference/systemModule8.errors.txt        |  34 -
 tests/baselines/reference/systemModule8.types |  28 -
 .../reference/systemModule9.errors.txt        |   2 -
 ...systemModuleAmbientDeclarations.errors.txt |  30 -
 .../systemModuleConstEnums.errors.txt         |  16 -
 .../reference/systemModuleConstEnums.types    |   3 -
 ...leConstEnumsSeparateCompilation.errors.txt |  16 -
 ...mModuleConstEnumsSeparateCompilation.types |   3 -
 .../systemModuleDeclarationMerging.errors.txt |  13 -
 .../systemModuleDeclarationMerging.types      |   3 -
 .../systemModuleExportDefault.errors.txt      |  17 -
 ...mModuleNonTopLevelModuleMembers.errors.txt |  16 -
 ...systemModuleNonTopLevelModuleMembers.types |   2 -
 .../systemModuleTargetES6.errors.txt          |  18 -
 .../systemModuleTrailingComments.errors.txt   |   8 -
 .../systemModuleWithSuperClass.errors.txt     |  14 -
 .../systemNamespaceAliasEmit.errors.txt       |  15 -
 .../systemObjectShorthandRename.errors.txt    |  14 -
 ....1(module=system,target=es2015).errors.txt |   2 -
 ....1(module=system,target=es2017).errors.txt |  83 --
 ...Await.1(module=system,target=es2017).types |   4 -
 .../reference/topLevelAwaitErrors.11.js       |  23 +-
 .../reference/topLevelExports.errors.txt      |  10 -
 tests/baselines/reference/topLevelLambda4.js  |  10 +-
 .../topLevelVarHoistingSystem.errors.txt      |  14 -
 ...ransformNestedGeneratorsWithTry.errors.txt |  35 -
 .../transformNestedGeneratorsWithTry.js       |  39 +-
 .../transformNestedGeneratorsWithTry.types    |  10 +-
 ...onJS option (verbatimModuleSyntax=true).js |  35 +-
 ...verbatimModuleSyntax=true).oldTranspile.js |  35 +-
 ...ata when transpile with CommonJS option.js |  35 +-
 ...spile with CommonJS option.oldTranspile.js |  35 +-
 ...en transpile with System option.errors.txt |   2 -
 ...with System option.oldTranspile.errors.txt |   2 -
 ...s not crash (verbatimModuleSyntax=true).js |  35 +-
 ...verbatimModuleSyntax=true).oldTranspile.js |  35 +-
 ...port star as ns conflict does not crash.js |  35 +-
 ...ns conflict does not crash.oldTranspile.js |  35 +-
 .../Generates module output.errors.txt        |   6 -
 ...ates module output.oldTranspile.errors.txt |   6 -
 .../Rename dependencies - AMD.errors.txt      |   8 -
 .../Rename dependencies - System.errors.txt   |   8 -
 .../Rename dependencies - UMD.errors.txt      |   8 -
 ...ons module-kind is out-of-range.errors.txt |   4 +-
 ...nd is out-of-range.oldTranspile.errors.txt |   4 +-
 ...s target-script is out-of-range.errors.txt |   4 +-
 ...pt is out-of-range.oldTranspile.errors.txt |   4 +-
 .../transpile/Sets module name.errors.txt     |   6 -
 .../Sets module name.oldTranspile.errors.txt  |   6 -
 .../modules-and-globals-mixed-in-amd.js       | 111 +--
 .../prepend-reports-deprecation-error.js      |  82 +-
 ...e-resolution-finds-original-source-file.js |  63 +-
 .../different-options-with-incremental.js     | 567 ++-----------
 .../commandLine/outFile/different-options.js  | 526 ++----------
 ...ndline-with-declaration-and-incremental.js | 318 +------
 ...y-false-on-commandline-with-declaration.js | 231 +----
 ...mitDeclarationOnly-false-on-commandline.js | 534 ++----------
 ...ndline-with-declaration-and-incremental.js | 471 ++---------
 ...ionOnly-on-commandline-with-declaration.js | 277 ++----
 .../emitDeclarationOnly-on-commandline.js     | 792 +++---------------
 ...tax-errors-in-config-file-discrepancies.js |   2 +
 .../reports-syntax-errors-in-config-file.js   | 113 ++-
 ...-dts-generation-errors-with-incremental.js |  36 +-
 .../outFile/reports-dts-generation-errors.js  |  18 +-
 .../outFile/deleted-file-without-composite.js |  23 +-
 .../outFile/detects-deleted-file.js           | 106 +--
 ...-transitive-module-with-isolatedModules.js |  40 +-
 .../inferred-type-from-transitive-module.js   |  40 +-
 ...hange-in-signature-with-isolatedModules.js |  49 +-
 .../outFile/dts-errors-discrepancies.js       |   3 -
 .../outFile/dts-errors-with-incremental.js    | 269 ++----
 .../tsbuild/noCheck/outFile/dts-errors.js     | 225 ++---
 .../outFile/semantic-errors-discrepancies.js  |   3 -
 .../semantic-errors-with-incremental.js       | 281 ++-----
 .../noCheck/outFile/semantic-errors.js        | 208 ++---
 .../outFile/syntax-errors-discrepancies.js    |   3 -
 .../outFile/syntax-errors-with-incremental.js | 218 ++---
 .../tsbuild/noCheck/outFile/syntax-errors.js  | 185 ++--
 .../noEmit/outFile/changes-composite.js       | 539 +++++++-----
 .../changes-incremental-declaration.js        | 539 +++++++-----
 .../noEmit/outFile/changes-incremental.js     | 539 +++++++-----
 .../changes-with-initial-noEmit-composite.js  | 263 +++---
 ...-initial-noEmit-incremental-declaration.js | 263 +++---
 ...changes-with-initial-noEmit-incremental.js | 263 +++---
 ...th-incremental-as-modules-discrepancies.js |  51 +-
 ...ble-changes-with-incremental-as-modules.js | 344 +++-----
 ...tion-enable-changes-with-multiple-files.js | 608 +++++++++-----
 ...th-incremental-as-modules-discrepancies.js | 103 ---
 .../dts-errors-with-incremental-as-modules.js | 285 +++----
 ...dts-enabled-with-incremental-as-modules.js | 286 ++-----
 ...ntic-errors-with-incremental-as-modules.js | 248 +++---
 ...ntax-errors-with-incremental-as-modules.js | 132 +--
 ...rrors-with-declaration-with-incremental.js | 153 ++--
 .../outFile/dts-errors-with-declaration.js    | 133 +--
 .../outFile/dts-errors-with-incremental.js    | 140 +---
 .../noEmitOnError/outFile/dts-errors.js       | 137 +--
 ...rrors-with-declaration-with-incremental.js | 101 +--
 .../semantic-errors-with-declaration.js       | 113 ++-
 .../semantic-errors-with-incremental.js       |  88 +-
 .../noEmitOnError/outFile/semantic-errors.js  | 100 +--
 ...rrors-with-declaration-with-incremental.js | 103 +--
 .../outFile/syntax-errors-with-declaration.js | 115 ++-
 .../outFile/syntax-errors-with-incremental.js |  90 +-
 .../noEmitOnError/outFile/syntax-errors.js    | 102 +--
 .../non-module-projects-without-prepend.js    |  94 +--
 .../always-builds-under-with-force-option.js  |  78 +-
 .../building-using-buildReferencedProject.js  |  39 +-
 ...uilding-using-getNextInvalidatedProject.js |  78 +-
 ...rectly-when-declarationDir-is-specified.js |  78 +-
 ...ilds-correctly-when-outDir-is-specified.js |  78 +-
 ...s-even-if-upstream-projects-have-errors.js |  78 +-
 .../sample1/builds-till-project-specified.js  |  39 +-
 .../can-detect-when-and-what-to-rebuild.js    |  78 +-
 ...t-in-not-build-order-doesnt-throw-error.js |  78 +-
 .../sample1/cleans-till-project-specified.js  |  78 +-
 ...vent-if-version-doesnt-match-ts-version.js |  78 +-
 .../reference/tsbuild/sample1/explainFiles.js |  78 +-
 ...it-would-skip-builds-during-a-dry-build.js |  78 +-
 .../sample1/invalidates-projects-correctly.js | 156 +---
 .../tsbuild/sample1/listEmittedFiles.js       |  78 +-
 .../reference/tsbuild/sample1/listFiles.js    |  78 +-
 ...-in-tsbuildinfo-doesnt-match-ts-version.js |  78 +-
 ...uilds-from-start-if-force-option-is-set.js |  78 +-
 ...uilds-when-extended-config-file-changes.js |  78 +-
 .../sample1/removes-all-files-it-built.js     |  78 +-
 ...ror-if-input-file-is-missing-with-force.js |  78 +-
 .../reports-error-if-input-file-is-missing.js |  78 +-
 .../reference/tsbuild/sample1/sample.js       | 182 +---
 ...rrors-when-test-does-not-reference-core.js |  78 +-
 ...ects-have-errors-with-stopBuildOnErrors.js |  78 +-
 .../sample1/when-declarationMap-changes.js    |  78 +-
 .../when-esModuleInterop-option-changes.js    |  77 +-
 ...ot-change-but-its-modified-time-changes.js |  78 +-
 .../when-logic-specifies-tsBuildInfoFile.js   | 182 +---
 ...hen-module-option-changes-discrepancies.js |  76 --
 .../sample1/when-module-option-changes.js     |  15 +-
 ...roject-uses-different-module-resolution.js |  25 +-
 .../reports-syntax-errors-in-config-file.js   | 126 ++-
 ...se-different-module-resolution-settings.js |  42 +-
 .../dts-errors-with-incremental-as-modules.js | 203 +++--
 ...dts-enabled-with-incremental-as-modules.js | 149 ++--
 ...ntic-errors-with-incremental-as-modules.js | 173 ++--
 ...ntax-errors-with-incremental-as-modules.js |  65 +-
 ...Error-with-declaration-with-incremental.js | 338 ++++----
 .../outFile/noEmitOnError-with-declaration.js | 283 +++++--
 .../outFile/noEmitOnError-with-incremental.js | 306 +++----
 .../noEmitOnError/outFile/noEmitOnError.js    | 215 +++--
 .../creates-solution-in-watch-mode.js         |  78 +-
 .../incremental-updates-in-verbose-mode.js    | 156 +---
 .../when-preserveWatchOutput-is-not-used.js   | 156 +---
 ...veWatchOutput-is-passed-on-command-line.js | 156 +---
 ...BuildOnErrors-is-passed-on-command-line.js | 117 +--
 ...rrors-when-test-does-not-reference-core.js |  78 +-
 ...ects-have-errors-with-stopBuildOnErrors.js |  78 +-
 ...-references-watches-only-those-projects.js |  39 +-
 ...tches-config-files-that-are-not-present.js | 115 +--
 ...le-is-added,-and-its-subsequent-updates.js |  78 +-
 ...hanges-and-reports-found-errors-message.js |  78 +-
 ...not-start-build-of-referencing-projects.js |  78 +-
 ...le-is-added,-and-its-subsequent-updates.js |  78 +-
 ...hanges-and-reports-found-errors-message.js |  78 +-
 ...not-start-build-of-referencing-projects.js |  78 +-
 ...does-not-add-color-when-NO_COLOR-is-set.js |   6 +-
 .../reference/tsc/commandLine/help-all.js     |  12 +-
 .../reference/tsc/commandLine/help.js         |   6 +-
 ...-when-host-can't-provide-terminal-width.js |   6 +-
 ...tatus.DiagnosticsPresent_OutputsSkipped.js |   6 +-
 .../tsc/composite/converting-to-modules.js    |  24 +-
 ...-dts-generation-errors-with-incremental.js |  49 +-
 .../outFile/reports-dts-generation-errors.js  |  31 +-
 ...in-another-file-through-indirect-import.js |   5 +-
 .../generates-typerefs-correctly.js           |  74 +-
 .../different-options-with-incremental.js     | 464 ++--------
 .../incremental/outFile/different-options.js  | 450 ++--------
 ...to-the-referenced-project-discrepancies.js |  61 +-
 ...file-is-added-to-the-referenced-project.js | 180 ++--
 ...s-errors-with-incremental-discrepancies.js | 110 ++-
 .../outFile/dts-errors-with-incremental.js    | 479 ++---------
 .../tsc/noCheck/outFile/dts-errors.js         | 174 +---
 ...c-errors-with-incremental-discrepancies.js | 110 ++-
 .../semantic-errors-with-incremental.js       | 481 ++---------
 .../tsc/noCheck/outFile/semantic-errors.js    | 172 +---
 ...x-errors-with-incremental-discrepancies.js | 110 ++-
 .../outFile/syntax-errors-with-incremental.js | 396 ++-------
 .../tsc/noCheck/outFile/syntax-errors.js      | 114 +--
 .../tsc/noEmit/outFile/changes-composite.js   | 572 ++++++++-----
 .../changes-incremental-declaration.js        | 572 ++++++++-----
 .../tsc/noEmit/outFile/changes-incremental.js | 572 ++++++++-----
 .../changes-with-initial-noEmit-composite.js  | 271 +++---
 ...-initial-noEmit-incremental-declaration.js | 271 +++---
 ...changes-with-initial-noEmit-incremental.js | 271 +++---
 ...tion-enable-changes-with-multiple-files.js | 563 ++++++++++---
 ...th-incremental-as-modules-discrepancies.js | 103 ---
 .../dts-errors-with-incremental-as-modules.js | 242 +++---
 ...dts-enabled-with-incremental-as-modules.js | 182 +---
 ...ntic-errors-with-incremental-as-modules.js | 206 +++--
 ...ntax-errors-with-incremental-as-modules.js |  80 +-
 ...rrors-with-declaration-with-incremental.js | 128 ++-
 .../outFile/dts-errors-with-declaration.js    |  89 +-
 .../outFile/dts-errors-with-incremental.js    |  82 +-
 .../tsc/noEmitOnError/outFile/dts-errors.js   |  66 +-
 ...-before-fixing-error-with-noEmitOnError.js |  20 +-
 ...rrors-with-declaration-with-incremental.js |  78 +-
 .../semantic-errors-with-declaration.js       |  71 +-
 .../semantic-errors-with-incremental.js       |  66 +-
 .../noEmitOnError/outFile/semantic-errors.js  |  58 +-
 ...rrors-with-declaration-with-incremental.js |  80 +-
 .../outFile/syntax-errors-with-declaration.js |  73 +-
 .../outFile/syntax-errors-with-incremental.js |  68 +-
 .../noEmitOnError/outFile/syntax-errors.js    |  60 +-
 ...ject-contains-invalid-project-reference.js |   7 +-
 ...-if-'--out'-or-'--outFile'-is-specified.js |  30 +-
 ...-recursive-directory-watcher-is-invoked.js |  24 +-
 ...ry-symlink-target-and-import-match-disk.js |  26 +-
 ...target-matches-disk-but-import-does-not.js |  26 +-
 ...link-target,-and-disk-are-all-different.js |  30 +-
 ...link-target-agree-but-do-not-match-disk.js |  30 +-
 ...k-but-directory-symlink-target-does-not.js |  30 +-
 ...editing-module-augmentation-incremental.js |   5 +-
 .../editing-module-augmentation-watch.js      |   5 +-
 .../own-file-emit-with-errors-incremental.js  |   5 +-
 .../own-file-emit-with-errors-watch.js        |   5 +-
 ...wn-file-emit-without-errors-incremental.js |   5 +-
 .../own-file-emit-without-errors-watch.js     |   5 +-
 .../with---out-incremental.js                 |   4 +-
 .../module-compilation/with---out-watch.js    |   4 +-
 .../late-discovered-dependency-symlink.js     |  70 +-
 .../dts-errors-with-incremental-as-modules.js | 197 +++--
 ...dts-enabled-with-incremental-as-modules.js | 137 +--
 ...ntic-errors-with-incremental-as-modules.js | 167 ++--
 ...ntax-errors-with-incremental-as-modules.js |  59 +-
 ...Error-with-declaration-with-incremental.js | 195 +++--
 .../outFile/noEmitOnError-with-declaration.js | 136 ++-
 .../outFile/noEmitOnError-with-incremental.js | 138 +--
 .../noEmitOnError/outFile/noEmitOnError.js    | 102 ++-
 ...hould-remove-the-module-not-found-error.js |  35 +-
 .../programUpdates/change-module-to-none.js   |  10 +-
 ...tore-the-states-for-configured-projects.js |  35 +-
 ...estore-the-states-for-inferred-projects.js |  35 +-
 .../declarationDir-is-specified.js            |  22 +-
 ...-outDir-and-declarationDir-is-specified.js |  22 +-
 .../when-outDir-is-specified.js               |  22 +-
 .../with-outFile.js                           |  25 +-
 ...e-is-specified-with-declaration-enabled.js |  22 +-
 .../without-outDir-or-outFile-is-specified.js |  22 +-
 ...odule-resolution-changes-in-config-file.js |  12 +-
 ...errors-and-still-try-to-build-a-project.js |  12 +-
 ...file-is-added-to-the-referenced-project.js | 184 ++--
 .../on-sample-project.js                      | 193 +----
 ...n-declarationMap-changes-for-dependency.js |  39 +-
 ...roject-uses-different-module-resolution.js |  18 +-
 .../tscWatch/resolutionCache/caching-works.js |  62 +-
 .../loads-missing-files-from-disk.js          |  17 +-
 ...module-goes-missing-and-then-comes-back.js |  25 +-
 ...are-global-and-installed-at-later-point.js |  19 +-
 ...-prefers-declaration-file-over-document.js |   5 +-
 .../when-emitting-with-emitOnlyDtsFiles.js    | 120 ++-
 ...noEmit-with-composite-with-emit-builder.js | 130 +--
 ...it-with-composite-with-semantic-builder.js | 119 +--
 ...nError-with-composite-with-emit-builder.js |  56 +-
 ...or-with-composite-with-semantic-builder.js |  56 +-
 .../outFile/semantic-builder-emitOnlyDts.js   |  27 +-
 ...createSemanticDiagnosticsBuilderProgram.js |  18 +-
 .../when-emitting-with-emitOnlyDtsFiles.js    |  79 +-
 ...ing-useSourceOfProjectReferenceRedirect.js | 184 ++--
 ...-host-implementing-getParsedCommandLine.js |  65 +-
 ...figMapOptionsAreCaseInsensitive.errors.txt |  21 -
 .../tsconfigMapOptionsAreCaseInsensitive.js   |   4 -
 .../compileOnSave/configProjects-outFile.js   |  17 +-
 .../emit-in-project-with-dts-emit.js          |  17 +-
 .../tsserver/compileOnSave/emit-in-project.js |  17 +-
 ...on-reflected-when-specifying-files-list.js |  17 +-
 ...odule-resolution-changes-in-config-file.js |  17 +-
 ...self-if---out-or---outFile-is-specified.js |  17 +-
 ...self-if---out-or---outFile-is-specified.js |  17 +-
 ...self-if---out-or---outFile-is-specified.js |  17 +-
 ...et-and-import-match-disk-with-link-open.js |  17 +-
 ...rt-match-disk-with-target-and-link-open.js |  17 +-
 ...-and-import-match-disk-with-target-open.js |  17 +-
 ...ry-symlink-target-and-import-match-disk.js |  17 +-
 ...disk-but-import-does-not-with-link-open.js |  17 +-
 ...port-does-not-with-target-and-link-open.js |  17 +-
 ...sk-but-import-does-not-with-target-open.js |  17 +-
 ...target-matches-disk-but-import-does-not.js |  17 +-
 ...d-disk-are-all-different-with-link-open.js |  17 +-
 ...all-different-with-target-and-link-open.js |  17 +-
 ...disk-are-all-different-with-target-open.js |  17 +-
 ...link-target,-and-disk-are-all-different.js |  17 +-
 ...ee-but-do-not-match-disk-with-link-open.js |  17 +-
 ...ot-match-disk-with-target-and-link-open.js |  17 +-
 ...-but-do-not-match-disk-with-target-open.js |  17 +-
 ...link-target-agree-but-do-not-match-disk.js |  17 +-
 ...-symlink-target-does-not-with-link-open.js |  17 +-
 ...rget-does-not-with-target-and-link-open.js |  17 +-
 ...ymlink-target-does-not-with-target-open.js |  17 +-
 ...k-but-directory-symlink-target-does-not.js |  17 +-
 .../fourslashServer/autoImportProvider3.js    |  80 +-
 .../importSuggestionsCache_coreNodeModules.js |  10 +
 .../importSuggestionsCache_exportUndefined.js |  26 +-
 ...portSuggestionsCache_moduleAugmentation.js |  80 +-
 .../isDefinitionAcrossGlobalProjects.js       |  24 +-
 ...-when-module-resolution-settings-change.js |  17 +-
 ...project-structure-and-reports-no-errors.js |  14 -
 ...-as-project-build-with-external-project.js |  49 +-
 ...e-doesnt-load-ancestor-sibling-projects.js |  17 +-
 ...ding-references-in-overlapping-projects.js |  17 +-
 ...disableSourceOfProjectReferenceRedirect.js |  79 +-
 ...ect-when-referenced-project-is-not-open.js |  17 +-
 ...disableSourceOfProjectReferenceRedirect.js |  96 +--
 ...project-when-referenced-project-is-open.js |  34 +-
 ...ng-solution-and-siblings-are-not-loaded.js |  17 +-
 .../resolutionCache/when-resolution-fails.js  |  28 -
 .../when-resolves-to-ambient-module.js        |  28 -
 ...enceDirective-contains-UpperCasePackage.js |  17 +-
 .../local-module-should-not-be-picked-up.js   |   2 +-
 .../reference/tsxAttributeResolution10.js     |  36 +-
 .../reference/tsxAttributeResolution9.js      |  28 +-
 .../tsxDeepAttributeAssignabilityError.js     |  70 +-
 .../baselines/reference/tsxDefaultImports.js  |   5 +-
 .../baselines/reference/tsxDynamicTagName5.js |  35 +-
 .../baselines/reference/tsxDynamicTagName7.js |  35 +-
 .../baselines/reference/tsxDynamicTagName8.js |  35 +-
 .../baselines/reference/tsxDynamicTagName9.js |  35 +-
 .../tsxElementResolution17.errors.txt         |  29 -
 .../reference/tsxElementResolution19.js       |  62 +-
 .../reference/tsxExternalModuleEmit1.js       |  70 +-
 .../reference/tsxExternalModuleEmit2.js       |   5 +-
 .../reference/tsxFragmentChildrenCheck.js     |  35 +-
 .../reference/tsxNoTypeAnnotatedSFC.js        |  35 +-
 .../reference/tsxPreserveEmit1.errors.txt     |  35 -
 .../reference/tsxPreserveEmit1.types          |  18 +-
 .../reference/tsxPreserveEmit2.errors.txt     |   8 -
 .../reference/tsxPreserveEmit2.types          |   8 +-
 .../reference/tsxPreserveEmit3.errors.txt     |  19 -
 .../reference/tsxPreserveEmit3.types          |   1 -
 .../reference/tsxSfcReturnNull.errors.txt     |  15 -
 .../reference/tsxSfcReturnNull.types          |   1 -
 ...sxSfcReturnNullStrictNullChecks.errors.txt |  15 -
 .../tsxSfcReturnNullStrictNullChecks.types    |   1 -
 .../tsxSfcReturnUndefinedStrictNullChecks.js  |  21 +-
 ...pe(jsx=react-jsx,target=es2015).errors.txt |   4 +-
 ...elessFunctionComponentOverload1.errors.txt |   2 -
 ...elessFunctionComponentOverload2.errors.txt |  37 -
 ...xStatelessFunctionComponentOverload2.types |   2 -
 ...elessFunctionComponentOverload3.errors.txt |  28 -
 ...xStatelessFunctionComponentOverload3.types |   7 -
 .../tsxStatelessFunctionComponentOverload4.js |  51 +-
 .../tsxStatelessFunctionComponentOverload5.js |  63 +-
 .../tsxStatelessFunctionComponentOverload6.js |  65 +-
 ...ponentWithDefaultTypeParameter1.errors.txt |  18 -
 ...ponentWithDefaultTypeParameter2.errors.txt |   2 -
 ...tsxStatelessFunctionComponents3.errors.txt |  22 -
 .../tsxStatelessFunctionComponents3.types     |   2 -
 ...ionComponentsWithTypeArguments1.errors.txt |  35 -
 ...ionComponentsWithTypeArguments2.errors.txt |   2 -
 ...ionComponentsWithTypeArguments3.errors.txt |  28 -
 ...essFunctionComponentsWithTypeArguments4.js |  17 +-
 ...ionComponentsWithTypeArguments5.errors.txt |  23 -
 .../reference/typeAliasDeclarationEmit.js     |   6 +-
 .../typeAliasDeclarationEmit2.errors.txt      |   6 -
 .../reference/typeAndNamespaceExportMerge.js  |  35 +-
 ...ompatibilityAccrossDeclarations.errors.txt |  27 -
 ...eterCompatibilityAccrossDeclarations.types |   2 -
 .../reference/typeResolution.errors.txt       | 115 ---
 .../baselines/reference/typeResolution.types  |   6 -
 .../typeUsedAsValueError2.errors.txt          |   4 +-
 .../reference/typeUsedAsValueError2.js        |  26 +-
 .../reference/typeUsedAsValueError2.symbols   |   6 +-
 .../reference/typeUsedAsValueError2.types     |   4 +-
 .../reference/typingsLookupAmd.errors.txt     |  14 -
 .../baselines/reference/umd-augmentation-1.js |  35 +-
 .../baselines/reference/umd-augmentation-3.js |  35 +-
 tests/baselines/reference/umd3.js             |  35 +-
 tests/baselines/reference/umd4.js             |  35 +-
 tests/baselines/reference/umd5.js             |  35 +-
 tests/baselines/reference/umd8.symbols        |   4 +-
 tests/baselines/reference/umd8.types          |  12 +-
 .../umdDependencyComment2.errors.txt          |   2 -
 .../umdDependencyCommentName1.errors.txt      |   2 -
 .../umdDependencyCommentName2.errors.txt      |   2 -
 .../reference/umdNamedAmdMode.errors.txt      |   7 -
 .../undeclaredModuleError.errors.txt          |   4 +-
 .../reference/undeclaredModuleError.js        |  35 +-
 .../reference/untypedModuleImport.js          |  70 +-
 .../reference/untypedModuleImport_allowJs.js  |   5 +-
 tests/baselines/reference/unusedImports11.js  |  37 +-
 .../baselines/reference/unusedImports11.types |   8 +-
 .../baselines/reference/unusedImports12.types |   4 +-
 .../unusedImports_entireImportDeclaration.js  |  42 +-
 ...nusedImports_entireImportDeclaration.types |  12 +-
 ...sTopLevelOfModule.1(module=amd).errors.txt |  18 -
 ...pLevelOfModule.1(module=system).errors.txt |  18 -
 ...sTopLevelOfModule.2(module=amd).errors.txt |  12 -
 ...sTopLevelOfModule.3(module=amd).errors.txt |  18 -
 ...pLevelOfModule.3(module=system).errors.txt |  18 -
 ....1(module=system,target=es2015).errors.txt |  15 -
 ...ors.1(module=system,target=es5).errors.txt |  15 -
 ....1(module=system,target=esnext).errors.txt |  15 -
 ...10(module=system,target=es2015).errors.txt |  15 -
 ...rs.10(module=system,target=es5).errors.txt |  15 -
 ...10(module=system,target=esnext).errors.txt |  15 -
 ...11(module=system,target=es2015).errors.txt |  17 -
 ...rs.11(module=system,target=es5).errors.txt |  17 -
 ...11(module=system,target=esnext).errors.txt |  17 -
 ...12(module=system,target=es2015).errors.txt |  17 -
 ...rs.12(module=system,target=es5).errors.txt |  17 -
 ...12(module=system,target=esnext).errors.txt |  17 -
 ....2(module=system,target=es2015).errors.txt |  15 -
 ...ors.2(module=system,target=es5).errors.txt |  15 -
 ....2(module=system,target=esnext).errors.txt |  15 -
 ....3(module=system,target=es2015).errors.txt |  16 -
 ...ors.3(module=system,target=es5).errors.txt |  16 -
 ....3(module=system,target=esnext).errors.txt |  16 -
 ....4(module=system,target=es2015).errors.txt |  15 -
 ...ors.4(module=system,target=es5).errors.txt |  15 -
 ....4(module=system,target=esnext).errors.txt |  15 -
 ....5(module=system,target=es2015).errors.txt |  16 -
 ...ors.5(module=system,target=es5).errors.txt |  16 -
 ....5(module=system,target=esnext).errors.txt |  16 -
 ....6(module=system,target=es2015).errors.txt |  16 -
 ...ors.6(module=system,target=es5).errors.txt |  16 -
 ....6(module=system,target=esnext).errors.txt |  16 -
 ....7(module=system,target=es2015).errors.txt |  16 -
 ...ors.7(module=system,target=es5).errors.txt |  16 -
 ....7(module=system,target=esnext).errors.txt |  16 -
 ....8(module=system,target=es2015).errors.txt |  15 -
 ...ors.8(module=system,target=es5).errors.txt |  15 -
 ....8(module=system,target=esnext).errors.txt |  15 -
 ....9(module=system,target=es2015).errors.txt |  18 -
 ...ors.9(module=system,target=es5).errors.txt |  18 -
 ....9(module=system,target=esnext).errors.txt |  18 -
 ....1(module=system,target=es2015).errors.txt |  15 -
 ...ors.1(module=system,target=es5).errors.txt |  15 -
 ....1(module=system,target=esnext).errors.txt |  15 -
 ...10(module=system,target=es2015).errors.txt |  15 -
 ...rs.10(module=system,target=es5).errors.txt |  15 -
 ...10(module=system,target=esnext).errors.txt |  15 -
 ...11(module=system,target=es2015).errors.txt |  17 -
 ...rs.11(module=system,target=es5).errors.txt |  17 -
 ...11(module=system,target=esnext).errors.txt |  17 -
 ...12(module=system,target=es2015).errors.txt |  17 -
 ...rs.12(module=system,target=es5).errors.txt |  17 -
 ...12(module=system,target=esnext).errors.txt |  17 -
 ....2(module=system,target=es2015).errors.txt |  15 -
 ...ors.2(module=system,target=es5).errors.txt |  15 -
 ....2(module=system,target=esnext).errors.txt |  15 -
 ....3(module=system,target=es2015).errors.txt |  15 -
 ...ors.3(module=system,target=es5).errors.txt |  15 -
 ....3(module=system,target=esnext).errors.txt |  15 -
 ....4(module=system,target=es2015).errors.txt |  15 -
 ...ors.4(module=system,target=es5).errors.txt |  15 -
 ....4(module=system,target=esnext).errors.txt |  15 -
 ....5(module=system,target=es2015).errors.txt |  16 -
 ...ors.5(module=system,target=es5).errors.txt |  16 -
 ....5(module=system,target=esnext).errors.txt |  16 -
 ....6(module=system,target=es2015).errors.txt |  16 -
 ...ors.6(module=system,target=es5).errors.txt |  16 -
 ....6(module=system,target=esnext).errors.txt |  16 -
 ....7(module=system,target=es2015).errors.txt |  15 -
 ...ors.7(module=system,target=es5).errors.txt |  15 -
 ....7(module=system,target=esnext).errors.txt |  15 -
 ....8(module=system,target=es2015).errors.txt |  15 -
 ...ors.8(module=system,target=es5).errors.txt |  15 -
 ....8(module=system,target=esnext).errors.txt |  15 -
 ....9(module=system,target=es2015).errors.txt |  15 -
 ...ors.9(module=system,target=es5).errors.txt |  15 -
 ....9(module=system,target=esnext).errors.txt |  15 -
 .../varArgsOnConstructorTypes.errors.txt      |  29 -
 .../reference/varArgsOnConstructorTypes.types |   6 -
 .../verbatimModuleSyntaxCompat.errors.txt     |   2 -
 ...tionsESM(esmoduleinterop=false).errors.txt |   2 -
 .../reference/withExportDecl.errors.txt       |  63 --
 .../baselines/reference/withExportDecl.types  |  10 -
 .../reference/withImportDecl.errors.txt       |  46 -
 .../baselines/reference/withImportDecl.types  |   5 -
 ...ntExternalModuleInAnotherExternalModule.ts |   2 +-
 tests/cases/compiler/augmentExportEquals1.ts  |   2 +-
 tests/cases/compiler/augmentExportEquals2.ts  |   2 +-
 tests/cases/compiler/augmentExportEquals3.ts  |   2 +-
 tests/cases/compiler/augmentExportEquals4.ts  |   2 +-
 tests/cases/compiler/augmentExportEquals5.ts  |   2 +-
 tests/cases/compiler/augmentExportEquals6.ts  |   2 +-
 .../compiler/badExternalModuleReference.ts    |   2 +-
 ...ScopedFunctionDeclarationInStrictModule.ts |   4 +-
 .../collisionExportsRequireAndAlias.ts        |   6 +-
 .../collisionExportsRequireAndAmbientClass.ts |   2 +-
 .../collisionExportsRequireAndAmbientEnum.ts  |   2 +-
 ...llisionExportsRequireAndAmbientFunction.ts |   2 +-
 ...collisionExportsRequireAndAmbientModule.ts |   2 +-
 .../collisionExportsRequireAndAmbientVar.ts   |   2 +-
 .../compiler/commentOnImportStatement1.ts     |   2 +-
 tests/cases/compiler/commonSourceDir5.ts      |   2 +-
 .../compiler/constDeclarations-access5.ts     |   4 +-
 tests/cases/compiler/copyrightWithNewLine1.ts |   2 +-
 .../compiler/copyrightWithoutNewLine1.ts      |   2 +-
 .../crashIntypeCheckInvocationExpression.ts   |   2 +-
 .../cases/compiler/duplicateLocalVariable2.ts |   2 +-
 .../duplicateSymbolsExportMatching.ts         |   2 +-
 .../emitHelpersWithLocalCollisions.ts         |   1 +
 .../es5-importHelpersAsyncFunctions.ts        |   3 +-
 .../compiler/es5ModuleInternalNamedImports.ts |   2 +-
 tests/cases/compiler/es6ExportAssignment2.ts  |   2 +-
 .../es6ExportClauseWithoutModuleSpecifier.ts  |  10 +-
 .../cases/compiler/es6ImportDefaultBinding.ts |   4 +-
 ...tDefaultBindingFollowedWithNamedImport1.ts |  12 +-
 ...indingFollowedWithNamedImportWithExport.ts |  14 +-
 ...aultBindingFollowedWithNamespaceBinding.ts |   2 +-
 ...ultBindingFollowedWithNamespaceBinding1.ts |   2 +-
 ...FollowedWithNamespaceBinding1WithExport.ts |   2 +-
 ...BindingFollowedWithNamespaceBindingDts1.ts |   2 +-
 .../es6ImportDefaultBindingWithExport.ts      |   6 +-
 .../compiler/es6ImportEqualsDeclaration.ts    |   2 +-
 .../es6ImportNamedImportParsingError.ts       |   8 +-
 tests/cases/compiler/exportDeclareClass1.ts   |   2 +-
 .../compiler/exportDefaultAsyncFunction2.ts   |   8 +-
 tests/cases/compiler/exportEqualErrorType.ts  |   4 +-
 tests/cases/compiler/exportSameNameFuncVar.ts |   2 +-
 .../exportedBlockScopedDeclarations.ts        |   2 +-
 .../compiler/fieldAndGetterWithSameName.ts    |   2 +-
 tests/cases/compiler/genericMemberFunction.ts |   2 +-
 .../compiler/genericReturnTypeFromGetter1.ts  |   2 +-
 tests/cases/compiler/giant.ts                 |   2 +-
 .../compiler/importDeclWithClassModifiers.ts  |   2 +-
 tests/cases/compiler/importHelpers.ts         |   3 +-
 .../compiler/importHelpersDeclarations.ts     |   1 +
 .../importHelpersInIsolatedModules.ts         |   3 +-
 tests/cases/compiler/importHelpersInTsx.tsx   |   3 +-
 .../importHelpersWithLocalCollisions.ts       |   3 +-
 tests/cases/compiler/interfaceDeclaration3.ts |   2 +-
 .../compiler/interfaceImplementation6.ts      |   2 +-
 ...sideLocalModuleWithoutExportAccessError.ts |   2 +-
 ...sideLocalModuleWithoutExportAccessError.ts |   2 +-
 .../compiler/jsxClassAttributeResolution.tsx  |   2 +-
 .../compiler/moduleAugmentationGlobal8.ts     |   2 +-
 .../compiler/moduleAugmentationGlobal8_1.ts   |   2 +-
 tests/cases/compiler/moduleExports1.ts        |   2 +-
 ...mbientExternalModuleImportWithoutExport.ts |   6 +-
 .../propertyIdentityWithPrivacyMismatch.ts    |   2 +-
 ...siveExportAssignmentAndFindAliasedType1.ts |   4 +-
 ...siveExportAssignmentAndFindAliasedType2.ts |   4 +-
 ...siveExportAssignmentAndFindAliasedType3.ts |   4 +-
 ...siveExportAssignmentAndFindAliasedType4.ts |   8 +-
 ...siveExportAssignmentAndFindAliasedType5.ts |  10 +-
 ...siveExportAssignmentAndFindAliasedType6.ts |  12 +-
 ...siveExportAssignmentAndFindAliasedType7.ts |  12 +-
 .../cases/compiler/spreadUnionPropOverride.ts |  67 --
 .../compiler/staticInstanceResolution5.ts     |   4 +-
 tests/cases/compiler/topLevelLambda4.ts       |   2 +-
 .../compiler/typeAliasDeclarationEmit.ts      |   2 +-
 tests/cases/compiler/typeUsedAsValueError2.ts |   6 +-
 tests/cases/compiler/undeclaredModuleError.ts |   2 +-
 ...nalModuleInsideNonAmbientExternalModule.ts |   2 +-
 .../privateNames/privateNameEmitHelpers.ts    |   2 +-
 .../privateNameStaticEmitHelpers.ts           |   2 +-
 .../decorators/invalid/decoratorOnAwait.ts    |   4 -
 .../decorators/invalid/decoratorOnUsing.ts    |   8 -
 .../exportAssignmentAndDeclaration.ts         |   2 +-
 .../importNonExternalModule.ts                |   2 +-
 .../externalModules/topLevelAwaitErrors.11.ts |   2 +-
 .../importDefer/importDeferInvalidDefault.ts  |   2 +-
 .../importDefer/importDeferInvalidNamed.ts    |   2 +-
 .../importDefer/importDeferTypeConflict1.ts   |   2 +-
 .../importDefer/importDeferTypeConflict2.ts   |   2 +-
 .../jsx/tsxAttributeResolution10.tsx          |   2 +-
 .../jsx/tsxAttributeResolution11.tsx          |   2 +-
 .../jsx/tsxAttributeResolution14.tsx          |   2 +-
 .../jsx/tsxAttributeResolution9.tsx           |   2 +-
 .../jsx/tsxElementResolution19.tsx            |   2 +-
 .../tsxSfcReturnUndefinedStrictNullChecks.tsx |   2 +-
 ...tsxStatelessFunctionComponentOverload4.tsx |   2 +-
 ...tsxStatelessFunctionComponentOverload5.tsx |   2 +-
 ...tsxStatelessFunctionComponentOverload6.tsx |   2 +-
 ...ssFunctionComponentsWithTypeArguments4.tsx |   2 +-
 ...lyTypedStringLiteralsInJsxAttributes02.tsx |   2 +-
 .../fourslash/codeFixCalledES2015Import3.ts   |   3 +-
 .../fourslash/codeFixCalledES2015Import6.ts   |   3 +-
 .../fourslash/codeFixCalledES2015Import9.ts   |   3 +-
 ...codeFixMissingTypeAnnotationOnExports47.ts |   2 +-
 ...codeFixMissingTypeAnnotationOnExports48.ts |   2 +-
 ...ionListForTransitivelyExportedMembers04.ts |   7 +-
 .../completionListInImportClause01.ts         |  16 +-
 ...etionPropertyShorthandForObjectLiteral5.ts |   3 +-
 .../fourslash/completionsImportBaseUrl.ts     |   2 +-
 .../completionsImport_default_anonymous.ts    |   4 +-
 ...letionsImport_default_didNotExistBefore.ts |   4 +-
 ...sImport_default_exportDefaultIdentifier.ts |   4 +-
 ...ompletionsImport_exportEquals_anonymous.ts |   2 +-
 .../fourslash/completionsImport_matching.ts   |   2 +-
 .../completionsImport_multipleWithSameName.ts |   6 +-
 ...tionsImport_named_exportEqualsNamespace.ts |   4 +-
 .../completionsImport_notFromIndex.ts         |   9 +-
 .../fourslash/completionsImport_ofAlias.ts    |   4 +-
 ...mpletionsImport_ofAlias_preferShortPath.ts |   9 +-
 .../fourslash/completionsImport_quoteStyle.ts |   2 +-
 .../completionsImport_reExportDefault.ts      |   9 +-
 .../completionsThisProperties_globalType.ts   |   3 +-
 .../completionsUniqueSymbol_import.ts         |   4 +-
 .../completionsWithDeprecatedTag9.ts          |  11 +-
 tests/cases/fourslash/getPreProcessedFile.ts  |   3 +-
 ...ixNewImportExportEqualsESNextInteropOff.ts |   2 +-
 .../cases/fourslash/importTypeCompletions7.ts |   2 +-
 tests/cases/fourslash/javascriptModules24.ts  |   4 +-
 ...oImportCompletionsInOtherJavaScriptFile.ts |   8 +-
 .../fourslash/organizeImportsReactJsx.ts      |   2 +-
 .../fourslash/organizeImportsReactJsxDev.ts   |   2 +-
 .../fourslash/server/autoImportProvider3.ts   |   4 +-
 .../importSuggestionsCache_exportUndefined.ts |   4 +-
 ...portSuggestionsCache_moduleAugmentation.ts |   2 +-
 2404 files changed, 13877 insertions(+), 57451 deletions(-)
 delete mode 100644 tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt
 delete mode 100644 tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=classic).errors.txt
 delete mode 100644 tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=classic).errors.txt
 delete mode 100644 tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt
 delete mode 100644 tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt
 delete mode 100644 tests/baselines/reference/allowSyntheticDefaultImports7.errors.txt
 delete mode 100644 tests/baselines/reference/ambientExternalModuleMerging.errors.txt
 delete mode 100644 tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
 delete mode 100644 tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
 delete mode 100644 tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
 delete mode 100644 tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
 delete mode 100644 tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt
 delete mode 100644 tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
 delete mode 100644 tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
 delete mode 100644 tests/baselines/reference/amdModuleName1.errors.txt
 delete mode 100644 tests/baselines/reference/anonymousDefaultExportsAmd.errors.txt
 delete mode 100644 tests/baselines/reference/anonymousDefaultExportsSystem.errors.txt
 delete mode 100644 tests/baselines/reference/anonymousDefaultExportsUmd.errors.txt
 delete mode 100644 tests/baselines/reference/augmentExportEquals3_1.errors.txt
 delete mode 100644 tests/baselines/reference/augmentExportEquals4_1.errors.txt
 delete mode 100644 tests/baselines/reference/augmentExportEquals6_1.errors.txt
 delete mode 100644 tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
 delete mode 100644 tests/baselines/reference/awaitUsingDeclarationsTopLevelOfModule.1(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/bangInModuleName.errors.txt
 delete mode 100644 tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
 delete mode 100644 tests/baselines/reference/cacheResolutions.errors.txt
 delete mode 100644 tests/baselines/reference/cachedModuleResolution3.errors.txt
 delete mode 100644 tests/baselines/reference/cachedModuleResolution4.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop4.errors.txt
 delete mode 100644 tests/baselines/reference/classStaticBlock24(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/classStaticBlock24(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/classStaticBlock24(module=umd).errors.txt
 delete mode 100644 tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
 delete mode 100644 tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt
 delete mode 100644 tests/baselines/reference/commentsDottedModuleName.errors.txt
 delete mode 100644 tests/baselines/reference/commentsExternalModules.errors.txt
 delete mode 100644 tests/baselines/reference/commentsExternalModules2.errors.txt
 delete mode 100644 tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
 delete mode 100644 tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).errors.txt
 delete mode 100644 tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).errors.txt
 delete mode 100644 tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).errors.txt
 create mode 100644 tests/baselines/reference/commonSourceDir5.js
 delete mode 100644 tests/baselines/reference/commonSourceDir6.errors.txt
 delete mode 100644 tests/baselines/reference/constEnumExternalModule.errors.txt
 delete mode 100644 tests/baselines/reference/constEnumMergingWithValues1.errors.txt
 delete mode 100644 tests/baselines/reference/constEnumMergingWithValues2.errors.txt
 delete mode 100644 tests/baselines/reference/constEnumMergingWithValues3.errors.txt
 delete mode 100644 tests/baselines/reference/constEnumMergingWithValues4.errors.txt
 delete mode 100644 tests/baselines/reference/constEnumMergingWithValues5.errors.txt
 delete mode 100644 tests/baselines/reference/declFileExportAssignmentOfGenericInterface.errors.txt
 delete mode 100644 tests/baselines/reference/declFileExportImportChain.errors.txt
 delete mode 100644 tests/baselines/reference/declFileExportImportChain2.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmitAmdModuleNameDirective.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
 delete mode 100644 tests/baselines/reference/declarationMapsOutFile.errors.txt
 delete mode 100644 tests/baselines/reference/declarationMerging2.errors.txt
 delete mode 100644 tests/baselines/reference/decoratedClassExportsSystem1.errors.txt
 delete mode 100644 tests/baselines/reference/decoratedClassExportsSystem2.errors.txt
 delete mode 100644 tests/baselines/reference/decoratedClassFromExternalModule.errors.txt
 delete mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt
 delete mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.errors.txt
 delete mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.errors.txt
 delete mode 100644 tests/baselines/reference/decoratorOnAwait.errors.txt
 delete mode 100644 tests/baselines/reference/decoratorOnAwait.js
 delete mode 100644 tests/baselines/reference/decoratorOnAwait.symbols
 delete mode 100644 tests/baselines/reference/decoratorOnAwait.types
 delete mode 100644 tests/baselines/reference/decoratorOnUsing.errors.txt
 delete mode 100644 tests/baselines/reference/decoratorOnUsing.js
 delete mode 100644 tests/baselines/reference/decoratorOnUsing.symbols
 delete mode 100644 tests/baselines/reference/decoratorOnUsing.types
 delete mode 100644 tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt
 delete mode 100644 tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt
 delete mode 100644 tests/baselines/reference/defaultExportsGetExportedSystem.errors.txt
 delete mode 100644 tests/baselines/reference/defaultExportsGetExportedUmd.errors.txt
 delete mode 100644 tests/baselines/reference/dependencyViaImportAlias.errors.txt
 delete mode 100644 tests/baselines/reference/deprecatedCompilerOptions2.errors.txt
 delete mode 100644 tests/baselines/reference/destructuringInVariableDeclarations3.errors.txt
 delete mode 100644 tests/baselines/reference/destructuringInVariableDeclarations4.errors.txt
 delete mode 100644 tests/baselines/reference/destructuringInVariableDeclarations5.errors.txt
 delete mode 100644 tests/baselines/reference/destructuringInVariableDeclarations6.errors.txt
 delete mode 100644 tests/baselines/reference/destructuringInVariableDeclarations7.errors.txt
 delete mode 100644 tests/baselines/reference/destructuringInVariableDeclarations8.errors.txt
 delete mode 100644 tests/baselines/reference/dottedNamesInSystem.errors.txt
 delete mode 100644 tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
 delete mode 100644 tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt
 delete mode 100644 tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt
 delete mode 100644 tests/baselines/reference/dynamicRequire.errors.txt
 delete mode 100644 tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
 delete mode 100644 tests/baselines/reference/emitBundleWithShebang1.errors.txt
 delete mode 100644 tests/baselines/reference/emitBundleWithShebang2.errors.txt
 delete mode 100644 tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
 delete mode 100644 tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).errors.txt
 delete mode 100644 tests/baselines/reference/es5-amd.errors.txt
 delete mode 100644 tests/baselines/reference/es5-declaration-amd.errors.txt
 delete mode 100644 tests/baselines/reference/es5-souremap-amd.errors.txt
 delete mode 100644 tests/baselines/reference/es5-system.errors.txt
 delete mode 100644 tests/baselines/reference/es5-system2.errors.txt
 delete mode 100644 tests/baselines/reference/es5-umd.errors.txt
 delete mode 100644 tests/baselines/reference/es5-umd2.errors.txt
 delete mode 100644 tests/baselines/reference/es5-umd3.errors.txt
 delete mode 100644 tests/baselines/reference/es5-umd4.errors.txt
 delete mode 100644 tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt
 delete mode 100644 tests/baselines/reference/es6-amd.errors.txt
 delete mode 100644 tests/baselines/reference/es6-declaration-amd.errors.txt
 delete mode 100644 tests/baselines/reference/es6-sourcemap-amd.errors.txt
 delete mode 100644 tests/baselines/reference/es6-umd.errors.txt
 delete mode 100644 tests/baselines/reference/es6-umd2.errors.txt
 delete mode 100644 tests/baselines/reference/es6ExportAll.errors.txt
 delete mode 100644 tests/baselines/reference/es6ExportAssignment3.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportDefaultBindingAmd.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportNamedImportAmd.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportWithoutFromClause.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportWithoutFromClauseAmd.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt
 delete mode 100644 tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
 delete mode 100644 tests/baselines/reference/exportAndImport-es5-amd.errors.txt
 delete mode 100644 tests/baselines/reference/exportAsNamespace4(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/exportAsNamespace4(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/exportAsNamespace4(module=umd).errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentCircularModules.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentClass.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentError.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentFunction.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentInterface.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentInternalModule.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentMergedInterface.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentOfGenericType1.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentWithPrivacyError.errors.txt
 delete mode 100644 tests/baselines/reference/exportDeclarationForModuleOrEnumWithMemberOfSameName(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/exportEqualCallable.errors.txt
 delete mode 100644 tests/baselines/reference/exportEqualNamespaces.errors.txt
 delete mode 100644 tests/baselines/reference/exportEqualsAmd.errors.txt
 delete mode 100644 tests/baselines/reference/exportEqualsUmd.errors.txt
 delete mode 100644 tests/baselines/reference/exportImport.errors.txt
 delete mode 100644 tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
 delete mode 100644 tests/baselines/reference/exportImportMultipleFiles.errors.txt
 delete mode 100644 tests/baselines/reference/exportImportNonInstantiatedModule2.errors.txt
 delete mode 100644 tests/baselines/reference/exportObjectRest(module=amd,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/exportObjectRest(module=amd,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/exportObjectRest(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/exportObjectRest(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues10.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues2.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues3.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues4.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues5.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues6.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues7.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues8.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValues9.errors.txt
 delete mode 100644 tests/baselines/reference/exportStarForValuesInSystem.errors.txt
 delete mode 100644 tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt
 delete mode 100644 tests/baselines/reference/exportedVariable1.errors.txt
 delete mode 100644 tests/baselines/reference/exportingContainingVisibleType.errors.txt
 delete mode 100644 tests/baselines/reference/exportsAndImports1-amd.errors.txt
 delete mode 100644 tests/baselines/reference/exportsAndImports2-amd.errors.txt
 delete mode 100644 tests/baselines/reference/exportsAndImports3-amd.errors.txt
 delete mode 100644 tests/baselines/reference/exportsAndImports4-amd.errors.txt
 delete mode 100644 tests/baselines/reference/exportsInAmbientModules1.errors.txt
 delete mode 100644 tests/baselines/reference/exportsInAmbientModules2.errors.txt
 delete mode 100644 tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt
 delete mode 100644 tests/baselines/reference/externalModuleAssignToVar.errors.txt
 delete mode 100644 tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt
 delete mode 100644 tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
 delete mode 100644 tests/baselines/reference/generatorES6InAMDModule.errors.txt
 delete mode 100644 tests/baselines/reference/genericClassesInModule2.errors.txt
 delete mode 100644 tests/baselines/reference/genericInterfaceFunctionTypeParameter.errors.txt
 delete mode 100644 tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt
 delete mode 100644 tests/baselines/reference/genericWithIndexerOfTypeParameterType2.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionAsyncES5UMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionAsyncES6UMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionES5AMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionES5System.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionES5UMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionES6AMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionES6System.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionES6UMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInAMD1.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInAMD2.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInAMD3.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInAMD4.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInSystem1.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInSystem2.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInSystem3.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInSystem4.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInUMD1.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInUMD2.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInUMD3.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInUMD4.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionInUMD5.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionNestedAMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionNestedAMD2.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionNestedSystem.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionNestedSystem2.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionNestedUMD.errors.txt
 delete mode 100644 tests/baselines/reference/importCallExpressionNestedUMD2.errors.txt
 delete mode 100644 tests/baselines/reference/importDefaultBindingDefer.errors.txt
 delete mode 100644 tests/baselines/reference/importDeferComments.errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersAmd.errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersES6.errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersOutFile.errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersSystem.errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=commonjs).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=commonjs).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=commonjs).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importImportOnlyModule.errors.txt
 delete mode 100644 tests/baselines/reference/importMetaNarrowing(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/importShadowsGlobalName.errors.txt
 delete mode 100644 tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
 delete mode 100644 tests/baselines/reference/import_reference-exported-alias.errors.txt
 delete mode 100644 tests/baselines/reference/import_reference-to-type-alias.errors.txt
 delete mode 100644 tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.errors.txt
 delete mode 100644 tests/baselines/reference/import_var-referencing-an-imported-module-alias.errors.txt
 delete mode 100644 tests/baselines/reference/importedAliasesInTypePositions.errors.txt
 delete mode 100644 tests/baselines/reference/importedModuleClassNameClash.errors.txt
 delete mode 100644 tests/baselines/reference/importsInAmbientModules1.errors.txt
 delete mode 100644 tests/baselines/reference/importsInAmbientModules2.errors.txt
 delete mode 100644 tests/baselines/reference/importsInAmbientModules3.errors.txt
 delete mode 100644 tests/baselines/reference/instanceOfInExternalModules.errors.txt
 delete mode 100644 tests/baselines/reference/interfaceDeclaration5.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
 delete mode 100644 tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt
 delete mode 100644 tests/baselines/reference/isolatedModulesPlainFile-System.errors.txt
 delete mode 100644 tests/baselines/reference/isolatedModulesPlainFile-UMD.errors.txt
 delete mode 100644 tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
 delete mode 100644 tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
 delete mode 100644 tests/baselines/reference/keepImportsInDts1.errors.txt
 delete mode 100644 tests/baselines/reference/keepImportsInDts2.errors.txt
 delete mode 100644 tests/baselines/reference/keepImportsInDts3.errors.txt
 delete mode 100644 tests/baselines/reference/keepImportsInDts4.errors.txt
 delete mode 100644 tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
 delete mode 100644 tests/baselines/reference/libReferenceNoLibBundle.errors.txt
 delete mode 100644 tests/baselines/reference/memberAccessMustUseModuleInstances.errors.txt
 delete mode 100644 tests/baselines/reference/mergedDeclarations6.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAugmentationsImports1.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAugmentationsImports2.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAugmentationsImports3.errors.txt
 delete mode 100644 tests/baselines/reference/moduleAugmentationsImports4.errors.txt
 delete mode 100644 tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt
 delete mode 100644 tests/baselines/reference/moduleMergeConstructor.errors.txt
 delete mode 100644 tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
 delete mode 100644 tests/baselines/reference/moduleNoneOutFile.errors.txt
 delete mode 100644 tests/baselines/reference/modulePrologueAMD.errors.txt
 delete mode 100644 tests/baselines/reference/modulePrologueSystem.errors.txt
 delete mode 100644 tests/baselines/reference/modulePrologueUmd.errors.txt
 delete mode 100644 tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt
 delete mode 100644 tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt
 delete mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt
 delete mode 100644 tests/baselines/reference/objectIndexer.errors.txt
 delete mode 100644 tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
 delete mode 100644 tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
 delete mode 100644 tests/baselines/reference/outModuleConcatAmd.errors.txt
 delete mode 100644 tests/baselines/reference/outModuleConcatSystem.errors.txt
 delete mode 100644 tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
 delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.errors.txt
 delete mode 100644 tests/baselines/reference/privacyGetter.errors.txt
 delete mode 100644 tests/baselines/reference/privacyGloFunc.errors.txt
 delete mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/privatePropertyUsingObjectType.errors.txt
 delete mode 100644 tests/baselines/reference/project/baseline/amd/baseline.errors.txt
 delete mode 100644 tests/baselines/reference/project/baseline/node/baseline.errors.txt
 delete mode 100644 tests/baselines/reference/project/baseline2/amd/baseline2.errors.txt
 delete mode 100644 tests/baselines/reference/project/baseline2/node/baseline2.errors.txt
 delete mode 100644 tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
 delete mode 100644 tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
 delete mode 100644 tests/baselines/reference/project/circularReferencing/amd/circularReferencing.errors.txt
 delete mode 100644 tests/baselines/reference/project/circularReferencing/node/circularReferencing.errors.txt
 delete mode 100644 tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.errors.txt
 delete mode 100644 tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationDir/amd/declarationDir.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationDir/node/declarationDir.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationDir2/amd/declarationDir2.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationDir2/node/declarationDir2.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
 delete mode 100644 tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.errors.txt
 delete mode 100644 tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/node/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/amd/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/node/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/node/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.errors.txt
 delete mode 100644 tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.errors.txt
 delete mode 100644 tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
 delete mode 100644 tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.errors.txt
 delete mode 100644 tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.errors.txt
 delete mode 100644 tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
 delete mode 100644 tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
 delete mode 100644 tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
 delete mode 100644 tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
 delete mode 100644 tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.errors.txt
 delete mode 100644 tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.errors.txt
 delete mode 100644 tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.errors.txt
 delete mode 100644 tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.errors.txt
 delete mode 100644 tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
 delete mode 100644 tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
 delete mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.errors.txt
 delete mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.errors.txt
 delete mode 100644 tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt
 delete mode 100644 tests/baselines/reference/project/nonRelative/node/nonRelative.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
 delete mode 100644 tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
 delete mode 100644 tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
 delete mode 100644 tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
 delete mode 100644 tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.errors.txt
 delete mode 100644 tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.errors.txt
 delete mode 100644 tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
 delete mode 100644 tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
 delete mode 100644 tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
 delete mode 100644 tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
 delete mode 100644 tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.errors.txt
 delete mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeNested/amd/relativeNested.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeNested/node/relativeNested.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativePaths/amd/relativePaths.errors.txt
 delete mode 100644 tests/baselines/reference/project/relativePaths/node/relativePaths.errors.txt
 delete mode 100644 tests/baselines/reference/project/rootDirectory/amd/rootDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/rootDirectory/node/rootDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.errors.txt
 delete mode 100644 tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepath/amd/specifyExcludeUsingRelativepath.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepath/node/specifyExcludeUsingRelativepath.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/amd/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/node/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/amd/specifyExcludeWithOutUsingRelativePath.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/node/specifyExcludeWithOutUsingRelativePath.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/amd/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/node/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
 delete mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.errors.txt
 delete mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.errors.txt
 delete mode 100644 tests/baselines/reference/reexportMissingDefault5.errors.txt
 delete mode 100644 tests/baselines/reference/relativePathToDeclarationFile.errors.txt
 delete mode 100644 tests/baselines/reference/requireEmitSemicolon.errors.txt
 delete mode 100644 tests/baselines/reference/scopedPackagesClassic.errors.txt
 delete mode 100644 tests/baselines/reference/sourceMapValidationExportAssignment.errors.txt
 delete mode 100644 tests/baselines/reference/spreadUnionPropOverride.errors.txt
 delete mode 100644 tests/baselines/reference/spreadUnionPropOverride.js
 delete mode 100644 tests/baselines/reference/spreadUnionPropOverride.symbols
 delete mode 100644 tests/baselines/reference/spreadUnionPropOverride.types
 delete mode 100644 tests/baselines/reference/systemDefaultExportCommentValidity.errors.txt
 delete mode 100644 tests/baselines/reference/systemDefaultImportCallable.errors.txt
 delete mode 100644 tests/baselines/reference/systemExportAssignment.errors.txt
 delete mode 100644 tests/baselines/reference/systemExportAssignment3.errors.txt
 delete mode 100644 tests/baselines/reference/systemJsForInNoException.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule1.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule13.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule15.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule17.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule18.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule3.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule4.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule5.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule6.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule7.errors.txt
 delete mode 100644 tests/baselines/reference/systemModule8.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleConstEnums.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleExportDefault.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleTargetES6.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleTrailingComments.errors.txt
 delete mode 100644 tests/baselines/reference/systemModuleWithSuperClass.errors.txt
 delete mode 100644 tests/baselines/reference/systemNamespaceAliasEmit.errors.txt
 delete mode 100644 tests/baselines/reference/systemObjectShorthandRename.errors.txt
 delete mode 100644 tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).errors.txt
 delete mode 100644 tests/baselines/reference/topLevelExports.errors.txt
 delete mode 100644 tests/baselines/reference/topLevelVarHoistingSystem.errors.txt
 delete mode 100644 tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Generates module output.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Generates module output.oldTranspile.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Rename dependencies - AMD.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Rename dependencies - System.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Rename dependencies - UMD.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Sets module name.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Sets module name.oldTranspile.errors.txt
 delete mode 100644 tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
 delete mode 100644 tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
 delete mode 100644 tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
 delete mode 100644 tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.errors.txt
 delete mode 100644 tests/baselines/reference/tsxElementResolution17.errors.txt
 delete mode 100644 tests/baselines/reference/tsxPreserveEmit1.errors.txt
 delete mode 100644 tests/baselines/reference/tsxPreserveEmit2.errors.txt
 delete mode 100644 tests/baselines/reference/tsxPreserveEmit3.errors.txt
 delete mode 100644 tests/baselines/reference/tsxSfcReturnNull.errors.txt
 delete mode 100644 tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
 delete mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
 delete mode 100644 tests/baselines/reference/typeAliasDeclarationEmit2.errors.txt
 delete mode 100644 tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt
 delete mode 100644 tests/baselines/reference/typeResolution.errors.txt
 delete mode 100644 tests/baselines/reference/typingsLookupAmd.errors.txt
 delete mode 100644 tests/baselines/reference/umdNamedAmdMode.errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.2(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=system).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).errors.txt
 delete mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).errors.txt
 delete mode 100644 tests/baselines/reference/varArgsOnConstructorTypes.errors.txt
 delete mode 100644 tests/baselines/reference/withExportDecl.errors.txt
 delete mode 100644 tests/baselines/reference/withImportDecl.errors.txt
 delete mode 100644 tests/cases/compiler/spreadUnionPropOverride.ts
 delete mode 100644 tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts
 delete mode 100644 tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts

diff --git a/.github/workflows/accept-baselines-fix-lints.yaml b/.github/workflows/accept-baselines-fix-lints.yaml
index 0328f0b3cf701..cfe531912f870 100644
--- a/.github/workflows/accept-baselines-fix-lints.yaml
+++ b/.github/workflows/accept-baselines-fix-lints.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b77b1a844b32b..6ca8c3ba11cb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,7 +119,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Use node version ${{ matrix.config.node-version }}
-        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ matrix.config.node-version }}
           check-latest: true
@@ -151,7 +151,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -176,7 +176,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -202,7 +202,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -222,7 +222,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -238,7 +238,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -252,7 +252,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -300,7 +300,7 @@ jobs:
           path: base
           ref: ${{ github.base_ref }}
 
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -333,7 +333,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -349,7 +349,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
@@ -370,7 +370,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: npm ci
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f9319609623a0..4dc14bf614c74 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -46,7 +46,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
         # Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 976b2a2e9e650..439403372b215 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -16,7 +16,7 @@ jobs:
     # If you do not check out your code, Copilot will do this for you.
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
       - run: npm ci
       # pull dprint caches before network access is blocked
       - run: npx hereby check-format || true
diff --git a/.github/workflows/insiders.yaml b/.github/workflows/insiders.yaml
index e8bdc5072ac1f..6dff25a0842d8 100644
--- a/.github/workflows/insiders.yaml
+++ b/.github/workflows/insiders.yaml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
           # Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
diff --git a/.github/workflows/lkg.yml b/.github/workflows/lkg.yml
index 625ae46df36fc..e90dc0669adba 100644
--- a/.github/workflows/lkg.yml
+++ b/.github/workflows/lkg.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/new-release-branch.yaml b/.github/workflows/new-release-branch.yaml
index 6aee0bfad78cf..de6bcf491f3dc 100644
--- a/.github/workflows/new-release-branch.yaml
+++ b/.github/workflows/new-release-branch.yaml
@@ -55,7 +55,7 @@ jobs:
           filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
           fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 85473eb07ac5d..629adf4555801 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
           # Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
diff --git a/.github/workflows/release-branch-artifact.yaml b/.github/workflows/release-branch-artifact.yaml
index ee79d989743f5..a81442d50fd84 100644
--- a/.github/workflows/release-branch-artifact.yaml
+++ b/.github/workflows/release-branch-artifact.yaml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 5b3c4c2921f6d..dd41ba49399af 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -55,6 +55,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/set-version.yaml b/.github/workflows/set-version.yaml
index f0a6988e283c0..47eddc9921e7d 100644
--- a/.github/workflows/set-version.yaml
+++ b/.github/workflows/set-version.yaml
@@ -53,7 +53,7 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/.github/workflows/sync-branch.yaml b/.github/workflows/sync-branch.yaml
index 20ee1fb6cbb30..30a8c57e6818c 100644
--- a/.github/workflows/sync-branch.yaml
+++ b/.github/workflows/sync-branch.yaml
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/.github/workflows/twoslash-repros.yaml b/.github/workflows/twoslash-repros.yaml
index dd6017c93398f..5e71a0e830c60 100644
--- a/.github/workflows/twoslash-repros.yaml
+++ b/.github/workflows/twoslash-repros.yaml
@@ -57,7 +57,7 @@ jobs:
           fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
       - if: ${{ !github.event.inputs.bisect }}
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - uses: microsoft/TypeScript-Twoslash-Repro-Action@master
diff --git a/.github/workflows/update-package-lock.yaml b/.github/workflows/update-package-lock.yaml
index 1b34c1935ba48..4aa01408dc240 100644
--- a/.github/workflows/update-package-lock.yaml
+++ b/.github/workflows/update-package-lock.yaml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 'lts/*'
       - run: |
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index dbc7b0f3f84c5..07aab08570296 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -33862,7 +33862,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function checkSpreadPropOverrides(type: Type, props: SymbolTable, spread: SpreadAssignment | JsxSpreadAttribute) {
         for (const right of getPropertiesOfType(type)) {
-            if (!(right.flags & SymbolFlags.Optional) && !(getCheckFlags(right) & CheckFlags.Partial)) {
+            if (!(right.flags & SymbolFlags.Optional)) {
                 const left = props.get(right.escapedName);
                 if (left) {
                     const diagnostic = error(left.valueDeclaration, Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, unescapeLeadingUnderscores(left.escapedName));
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 4c0ffb2ad57e5..7688aad98b845 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -608,7 +608,6 @@ export const moduleOptionDeclaration: CommandLineOptionOfCustomType = {
         nodenext: ModuleKind.NodeNext,
         preserve: ModuleKind.Preserve,
     })),
-    deprecatedKeys: new Set(["none", "amd", "system", "umd"]),
     affectsSourceFile: true,
     affectsModuleResolution: true,
     affectsEmit: true,
@@ -700,7 +699,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
         showInSimplifiedHelpView: true,
         category: Diagnostics.JavaScript_Support,
         description: Diagnostics.Allow_JavaScript_files_to_be_a_part_of_your_program_Use_the_checkJs_option_to_get_errors_from_these_files,
-        defaultValueDescription: Diagnostics.false_unless_checkJs_is_set,
+        defaultValueDescription: false,
     },
     {
         name: "checkJs",
@@ -1072,13 +1071,13 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
             nodenext: ModuleResolutionKind.NodeNext,
             bundler: ModuleResolutionKind.Bundler,
         })),
-        deprecatedKeys: new Set(["node", "node10", "classic"]),
+        deprecatedKeys: new Set(["node"]),
         affectsSourceFile: true,
         affectsModuleResolution: true,
         paramType: Diagnostics.STRATEGY,
         category: Diagnostics.Modules,
         description: Diagnostics.Specify_how_TypeScript_looks_up_a_file_from_a_given_module_specifier,
-        defaultValueDescription: Diagnostics.nodenext_if_module_is_nodenext_node16_if_module_is_node16_or_node18_otherwise_bundler,
+        defaultValueDescription: Diagnostics.module_AMD_or_UMD_or_System_or_ES6_then_Classic_Otherwise_Node,
     },
     {
         name: "baseUrl",
@@ -1151,7 +1150,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
         affectsBuildInfo: true,
         category: Diagnostics.Interop_Constraints,
         description: Diagnostics.Allow_import_x_from_y_when_a_module_doesn_t_have_a_default_export,
-        defaultValueDescription: true,
+        defaultValueDescription: Diagnostics.module_system_or_esModuleInterop,
     },
     {
         name: "esModuleInterop",
@@ -1162,7 +1161,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
         showInSimplifiedHelpView: true,
         category: Diagnostics.Interop_Constraints,
         description: Diagnostics.Emit_additional_JavaScript_to_ease_support_for_importing_CommonJS_modules_This_enables_allowSyntheticDefaultImports_for_type_compatibility,
-        defaultValueDescription: true,
+        defaultValueDescription: false,
     },
     {
         name: "preserveSymlinks",
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5731936e4978e..3d31d02ea8dbc 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -6587,7 +6587,10 @@
         "category": "Message",
         "code": 6903
     },
-
+    "module === \"system\" or esModuleInterop": {
+        "category": "Message",
+        "code": 6904
+    },
     "`false`, unless `strict` is set": {
         "category": "Message",
         "code": 6905
@@ -6608,7 +6611,7 @@
         "category": "Message",
         "code": 6909
     },
-    "`nodenext` if `module` is `nodenext`; `node16` if `module` is `node16` or `node18`; otherwise, `bundler`.": {
+    "module === `AMD` or `UMD` or `System` or `ES6`, then `Classic`, Otherwise `Node`": {
         "category": "Message",
         "code": 69010
     },
@@ -6696,10 +6699,6 @@
         "category": "Error",
         "code": 6931
     },
-    "`false`, unless `checkJs` is set": {
-        "category": "Message",
-        "code": 6932
-    },
 
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 68133ac5f1e40..d641cbd4b65e7 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -7505,11 +7505,7 @@ namespace Parser {
             case SyntaxKind.LetKeyword:
             case SyntaxKind.ConstKeyword:
             case SyntaxKind.UsingKeyword:
-                return parseVariableStatement(pos, hasJSDoc, modifiersIn);
             case SyntaxKind.AwaitKeyword:
-                if (!isAwaitUsingDeclaration()) {
-                    break;
-                }
                 return parseVariableStatement(pos, hasJSDoc, modifiersIn);
             case SyntaxKind.FunctionKeyword:
                 return parseFunctionDeclaration(pos, hasJSDoc, modifiersIn);
@@ -7538,16 +7534,17 @@ namespace Parser {
                     default:
                         return parseExportDeclaration(pos, hasJSDoc, modifiersIn);
                 }
+            default:
+                if (modifiersIn) {
+                    // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
+                    // would follow. For recovery and error reporting purposes, return an incomplete declaration.
+                    const missing = createMissingNode<MissingDeclaration>(SyntaxKind.MissingDeclaration, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
+                    setTextRangePos(missing, pos);
+                    (missing as Mutable<MissingDeclaration>).modifiers = modifiersIn;
+                    return missing;
+                }
+                return undefined!; // TODO: GH#18217
         }
-        if (modifiersIn) {
-            // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
-            // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-            const missing = createMissingNode<MissingDeclaration>(SyntaxKind.MissingDeclaration, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
-            setTextRangePos(missing, pos);
-            (missing as Mutable<MissingDeclaration>).modifiers = modifiersIn;
-            return missing;
-        }
-        return undefined!; // TODO: GH#18217
     }
 
     function nextTokenIsStringLiteral() {
@@ -7680,9 +7677,7 @@ namespace Parser {
                 flags |= NodeFlags.Using;
                 break;
             case SyntaxKind.AwaitKeyword:
-                if (!isAwaitUsingDeclaration()) {
-                    break;
-                }
+                Debug.assert(isAwaitUsingDeclaration());
                 flags |= NodeFlags.AwaitUsing;
                 nextToken();
                 break;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 23ecd881ec09c..c381f27d2112c 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -4498,21 +4498,9 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
             if (options.moduleResolution === ModuleResolutionKind.Node10) {
                 createDeprecatedDiagnostic("moduleResolution", "node10", /*useInstead*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information);
             }
-            if (options.moduleResolution === ModuleResolutionKind.Classic) {
-                createDeprecatedDiagnostic("moduleResolution", "classic", /*useInstead*/ undefined, /*related*/ undefined);
-            }
             if (options.baseUrl !== undefined) {
                 createDeprecatedDiagnostic("baseUrl", /*value*/ undefined, /*useInstead*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information);
             }
-            if (options.esModuleInterop === false) {
-                createDeprecatedDiagnostic("esModuleInterop", "false", /*useInstead*/ undefined, /*related*/ undefined);
-            }
-            if (options.allowSyntheticDefaultImports === false) {
-                createDeprecatedDiagnostic("allowSyntheticDefaultImports", "false", /*useInstead*/ undefined, /*related*/ undefined);
-            }
-            if (options.module === ModuleKind.None || options.module === ModuleKind.AMD || options.module === ModuleKind.UMD || options.module === ModuleKind.System) {
-                createDeprecatedDiagnostic("module", ModuleKind[options.module], /*useInstead*/ undefined, /*related*/ undefined);
-            }
         });
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2b2aeb8a8258d..f1b59e13ade4a 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -7315,7 +7315,6 @@ export function diagnosticCategoryName(d: { category: DiagnosticCategory; }, low
 }
 
 export enum ModuleResolutionKind {
-    /** @deprecated */
     Classic = 1,
     /**
      * @deprecated
@@ -7579,14 +7578,10 @@ export interface TypeAcquisition {
 }
 
 export enum ModuleKind {
-    /** @deprecated */
     None = 0,
     CommonJS = 1,
-    /** @deprecated */
     AMD = 2,
-    /** @deprecated */
     UMD = 3,
-    /** @deprecated */
     System = 4,
 
     // NOTE: ES module kinds should be contiguous to more easily check whether a module kind is *any* ES module kind.
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 9805b7ae9b1e4..7f40d470abd17 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -9015,23 +9015,27 @@ const _computedOptions = createComputedCompilerOptions({
     moduleResolution: {
         dependencies: ["module", "target"],
         computeValue: (compilerOptions): ModuleResolutionKind => {
-            if (compilerOptions.moduleResolution !== undefined) {
-                return compilerOptions.moduleResolution;
-            }
-            const moduleKind = _computedOptions.module.computeValue(compilerOptions);
-            switch (moduleKind) {
-                case ModuleKind.None:
-                case ModuleKind.AMD:
-                case ModuleKind.UMD:
-                case ModuleKind.System:
-                    return ModuleResolutionKind.Classic;
-                case ModuleKind.NodeNext:
-                    return ModuleResolutionKind.NodeNext;
-            }
-            if (ModuleKind.Node16 <= moduleKind && moduleKind < ModuleKind.NodeNext) {
-                return ModuleResolutionKind.Node16;
+            let moduleResolution = compilerOptions.moduleResolution;
+            if (moduleResolution === undefined) {
+                switch (_computedOptions.module.computeValue(compilerOptions)) {
+                    case ModuleKind.Node16:
+                    case ModuleKind.Node18:
+                    case ModuleKind.Node20:
+                        moduleResolution = ModuleResolutionKind.Node16;
+                        break;
+                    case ModuleKind.NodeNext:
+                        moduleResolution = ModuleResolutionKind.NodeNext;
+                        break;
+                    case ModuleKind.CommonJS:
+                    case ModuleKind.Preserve:
+                        moduleResolution = ModuleResolutionKind.Bundler;
+                        break;
+                    default:
+                        moduleResolution = ModuleResolutionKind.Classic;
+                        break;
+                }
             }
-            return ModuleResolutionKind.Bundler;
+            return moduleResolution;
         },
     },
     moduleDetection: {
@@ -9053,25 +9057,35 @@ const _computedOptions = createComputedCompilerOptions({
         },
     },
     esModuleInterop: {
-        dependencies: [],
+        dependencies: ["module", "target"],
         computeValue: (compilerOptions): boolean => {
             if (compilerOptions.esModuleInterop !== undefined) {
                 return compilerOptions.esModuleInterop;
             }
-            return true;
+            switch (_computedOptions.module.computeValue(compilerOptions)) {
+                case ModuleKind.Node16:
+                case ModuleKind.Node18:
+                case ModuleKind.Node20:
+                case ModuleKind.NodeNext:
+                case ModuleKind.Preserve:
+                    return true;
+            }
+            return false;
         },
     },
     allowSyntheticDefaultImports: {
-        dependencies: [],
+        dependencies: ["module", "target", "moduleResolution"],
         computeValue: (compilerOptions): boolean => {
             if (compilerOptions.allowSyntheticDefaultImports !== undefined) {
                 return compilerOptions.allowSyntheticDefaultImports;
             }
-            return true;
+            return _computedOptions.esModuleInterop.computeValue(compilerOptions)
+                || _computedOptions.module.computeValue(compilerOptions) === ModuleKind.System
+                || _computedOptions.moduleResolution.computeValue(compilerOptions) === ModuleResolutionKind.Bundler;
         },
     },
     resolvePackageJsonExports: {
-        dependencies: ["moduleResolution", "module", "target"],
+        dependencies: ["moduleResolution"],
         computeValue: (compilerOptions): boolean => {
             const moduleResolution = _computedOptions.moduleResolution.computeValue(compilerOptions);
             if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -9090,7 +9104,7 @@ const _computedOptions = createComputedCompilerOptions({
         },
     },
     resolvePackageJsonImports: {
-        dependencies: ["moduleResolution", "resolvePackageJsonExports", "module", "target"],
+        dependencies: ["moduleResolution", "resolvePackageJsonExports"],
         computeValue: (compilerOptions): boolean => {
             const moduleResolution = _computedOptions.moduleResolution.computeValue(compilerOptions);
             if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
diff --git a/src/harness/fourslashInterfaceImpl.ts b/src/harness/fourslashInterfaceImpl.ts
index 6178b2723f13e..db6127dc106e0 100644
--- a/src/harness/fourslashInterfaceImpl.ts
+++ b/src/harness/fourslashInterfaceImpl.ts
@@ -279,9 +279,6 @@ export class Verify extends VerifyNegatable {
             return this.state.verifyCompletions(optionsArray[0]);
         }
         for (const options of optionsArray) {
-            if (options.preferences && Object.keys(options).length === 1 && optionsArray.length > 1 && optionsArray.indexOf(options) > 0) {
-                throw new Error("Did you mean to put 'preferences' in the previous 'verify.completions' object argument instead of their own object?");
-            }
             this.state.verifyCompletions(options);
         }
         return {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index fbb0cf9406436..96f01f824bd57 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -481,7 +481,7 @@ export const enum SymbolOriginInfoKind {
     ComputedPropertyName = 1 << 9,
 
     SymbolMemberNoExport = SymbolMember,
-    SymbolMemberExport   = SymbolMember | ResolvedExport,
+    SymbolMemberExport   = SymbolMember | Export,
 }
 
 /** @internal */
@@ -535,7 +535,7 @@ function originIsExport(origin: SymbolOriginInfo | undefined): origin is SymbolO
 }
 
 function originIsResolvedExport(origin: SymbolOriginInfo | undefined): origin is SymbolOriginInfoResolvedExport {
-    return !!(origin && origin.kind & SymbolOriginInfoKind.ResolvedExport);
+    return !!(origin && origin.kind === SymbolOriginInfoKind.ResolvedExport);
 }
 
 function originIncludesSymbolName(origin: SymbolOriginInfo | undefined): origin is SymbolOriginInfoExport | SymbolOriginInfoResolvedExport | SymbolOriginInfoComputedPropertyName {
@@ -2621,12 +2621,12 @@ function isRecommendedCompletionMatch(localSymbol: Symbol, recommendedCompletion
 }
 
 function getSourceFromOrigin(origin: SymbolOriginInfo | undefined): string | undefined {
-    if (originIsResolvedExport(origin)) {
-        return origin.moduleSpecifier;
-    }
     if (originIsExport(origin)) {
         return stripQuotes(origin.moduleSymbol.name);
     }
+    if (originIsResolvedExport(origin)) {
+        return origin.moduleSpecifier;
+    }
     if (origin?.kind === SymbolOriginInfoKind.ThisType) {
         return CompletionSource.ThisProperty;
     }
diff --git a/src/testRunner/unittests/evaluation/awaitUsingDeclarations.ts b/src/testRunner/unittests/evaluation/awaitUsingDeclarations.ts
index 56e8422632f77..6cd8864e85785 100644
--- a/src/testRunner/unittests/evaluation/awaitUsingDeclarations.ts
+++ b/src/testRunner/unittests/evaluation/awaitUsingDeclarations.ts
@@ -1445,7 +1445,7 @@ describe("unittests:: evaluation:: awaitUsingDeclarations", () => {
         export const y = 2;
         output.push("after export y");
         `,
-            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
+            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.System },
         );
 
         assert.strictEqual(x, 1);
diff --git a/src/testRunner/unittests/evaluation/updateExpressionInModule.ts b/src/testRunner/unittests/evaluation/updateExpressionInModule.ts
index 357ca120ba682..2dc7b5188a650 100644
--- a/src/testRunner/unittests/evaluation/updateExpressionInModule.ts
+++ b/src/testRunner/unittests/evaluation/updateExpressionInModule.ts
@@ -31,7 +31,7 @@ describe("unittests:: evaluation:: updateExpressionInModule", () => {
             },
             rootFiles: ["/.src/main.ts"],
             main: "/.src/main.ts",
-        }, { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" });
+        }, { module: ts.ModuleKind.System });
         assert.equal(result.a, 2);
         assert.equal(result.b, 2);
     });
@@ -67,7 +67,7 @@ describe("unittests:: evaluation:: updateExpressionInModule", () => {
                 rootFiles: ["/.src/main.ts"],
                 main: "/.src/main.ts",
             },
-            { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
+            { module: ts.ModuleKind.System },
             { BigInt },
         );
         assert.equal(result.a, BigInt(2));
@@ -99,7 +99,7 @@ describe("unittests:: evaluation:: updateExpressionInModule", () => {
             },
             rootFiles: ["/.src/main.ts"],
             main: "/.src/main.ts",
-        }, { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" });
+        }, { module: ts.ModuleKind.System });
         assert.equal(result.a, 2);
         assert.equal(result.b, 1);
     });
@@ -135,7 +135,7 @@ describe("unittests:: evaluation:: updateExpressionInModule", () => {
                 rootFiles: ["/.src/main.ts"],
                 main: "/.src/main.ts",
             },
-            { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
+            { module: ts.ModuleKind.System },
             { BigInt },
         );
         assert.equal(result.a, BigInt(2));
diff --git a/src/testRunner/unittests/evaluation/usingDeclarations.ts b/src/testRunner/unittests/evaluation/usingDeclarations.ts
index a9819941fe70d..64bfa12416bc1 100644
--- a/src/testRunner/unittests/evaluation/usingDeclarations.ts
+++ b/src/testRunner/unittests/evaluation/usingDeclarations.ts
@@ -1594,7 +1594,7 @@ describe("unittests:: evaluation:: usingDeclarations", () => {
         export const y = 2;
         output.push("after export y");
         `,
-            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.AMD, ignoreDeprecations: "6.0" },
+            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.AMD },
         );
 
         assert.strictEqual(x, 1);
@@ -1624,7 +1624,7 @@ describe("unittests:: evaluation:: usingDeclarations", () => {
         export const y = 2;
         output.push("after export y");
         `,
-            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
+            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.System },
         );
 
         assert.strictEqual(x, 1);
diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts
index d9cce42321d01..30114dc48f8a2 100644
--- a/src/testRunner/unittests/tscWatch/incremental.ts
+++ b/src/testRunner/unittests/tscWatch/incremental.ts
@@ -130,7 +130,7 @@ describe("unittests:: tscWatch:: incremental:: emit file --incremental", () => {
         };
         const config: File = {
             path: configFile.path,
-            content: jsonToReadableText({ compilerOptions: { incremental: true, module: "amd", ignoreDeprecations: "6.0" } }),
+            content: jsonToReadableText({ compilerOptions: { incremental: true, module: "amd" } }),
         };
 
         verifyIncrementalWatchEmit({
@@ -202,7 +202,6 @@ describe("unittests:: tscWatch:: incremental:: emit file --incremental", () => {
                     incremental: true,
                     module: ts.ModuleKind.AMD,
                     configFilePath: config.path,
-                    ignoreDeprecations: "6.0",
                 });
 
                 assert.equal(ts.arrayFrom(builderProgram.state.referencedMap!.keys()).length, 0);
@@ -229,7 +228,7 @@ describe("unittests:: tscWatch:: incremental:: emit file --incremental", () => {
         verifyIncrementalWatchEmit({
             files: () => [file1, file2, {
                 path: configFile.path,
-                content: jsonToReadableText({ compilerOptions: { incremental: true, module: "amd", outFile: "out.js", ignoreDeprecations: "6.0" } }),
+                content: jsonToReadableText({ compilerOptions: { incremental: true, module: "amd", outFile: "out.js" } }),
             }],
             subScenario: "module compilation/with --out",
         });
diff --git a/tests/baselines/reference/APISample_jsdoc.js b/tests/baselines/reference/APISample_jsdoc.js
index 4454df333d826..1e087006d4044 100644
--- a/tests/baselines/reference/APISample_jsdoc.js
+++ b/tests/baselines/reference/APISample_jsdoc.js
@@ -129,41 +129,8 @@ function getSomeOtherTags(node: ts.Node) {
  *           https://github.com/vega/ts-json-schema-generator
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = __importStar(require("typescript"));
+var ts = require("typescript");
 // excerpted from https://github.com/YousefED/typescript-json-schema
 // (converted from a method and modified; for example, `this: any` to compensate, among other changes)
 function parseCommentsIntoDefinition(symbol, definition, otherAnnotations) {
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index d51e23664055d..520c9b5845878 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -79,42 +79,9 @@ fileNames.forEach(fileName => {
  *       at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#traversing-the-ast-with-a-little-linter
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delint = delint;
-var ts = __importStar(require("typescript"));
+var ts = require("typescript");
 function delint(sourceFile) {
     delintNode(sourceFile);
     function delintNode(node) {
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 773de798d07bc..d206d75321039 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -31,41 +31,8 @@ console.log(JSON.stringify(result));
  *       at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-simple-transform-function
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = __importStar(require("typescript"));
+var ts = require("typescript");
 var source = "let x: string  = 'string'";
 var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
 console.log(JSON.stringify(result));
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index e944e0d47b077..7af77191943d4 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -126,41 +126,8 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
  *       at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#incremental-build-support-using-the-language-services
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = __importStar(require("typescript"));
+var ts = require("typescript");
 function watch(rootFileNames, options) {
     var files = {};
     // initialize the list of files
diff --git a/tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt b/tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt
deleted file mode 100644
index cf1deb71e192a..0000000000000
--- a/tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SystemModuleForStatementNoInitializer.ts (0 errors) ====
-    export { };
-    
-    let i = 0;
-    let limit = 10;
-    
-    for (; i < limit; ++i) {
-        break;
-    }
-    
-    for (; ; ++i) {
-        break;
-    }
-    
-    for (; ;) {
-        break;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasesInSystemModule1.errors.txt b/tests/baselines/reference/aliasesInSystemModule1.errors.txt
index 9a2a973a3d7f8..0d893092c1616 100644
--- a/tests/baselines/reference/aliasesInSystemModule1.errors.txt
+++ b/tests/baselines/reference/aliasesInSystemModule1.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 aliasesInSystemModule1.ts(1,24): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== aliasesInSystemModule1.ts (1 errors) ====
     import alias = require('foo');
                            ~~~~~
diff --git a/tests/baselines/reference/aliasesInSystemModule2.errors.txt b/tests/baselines/reference/aliasesInSystemModule2.errors.txt
index 721a9665c87c2..9a313dacd26c9 100644
--- a/tests/baselines/reference/aliasesInSystemModule2.errors.txt
+++ b/tests/baselines/reference/aliasesInSystemModule2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 aliasesInSystemModule2.ts(1,21): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== aliasesInSystemModule2.ts (1 errors) ====
     import {alias} from "foo";
                         ~~~~~
diff --git a/tests/baselines/reference/allowImportClausesToMergeWithTypes.js b/tests/baselines/reference/allowImportClausesToMergeWithTypes.js
index c4f490d1435a4..58d2af89667f7 100644
--- a/tests/baselines/reference/allowImportClausesToMergeWithTypes.js
+++ b/tests/baselines/reference/allowImportClausesToMergeWithTypes.js
@@ -35,24 +35,18 @@ exports.zzz = 123;
 exports.default = exports.zzz;
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = void 0;
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 exports.default = b_1.default;
 var x = { x: "" };
 b_1.default;
 //// [index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 var x = { x: "" };
 a_1.default;
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 b_1.default;
 var y = x;
diff --git a/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt b/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt
index 98e3d340ca637..ae5bc45ff3c2e 100644
--- a/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /c.ts(1,16): error TS2792: Cannot find module './thisfiledoesnotexist.ts'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /ts.ts (0 errors) ====
     export {};
     
diff --git a/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=classic).errors.txt b/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=classic).errors.txt
deleted file mode 100644
index 8bac3b2cb1dd0..0000000000000
--- a/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=classic).errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /types.d.ts (0 errors) ====
-    export declare type User = {
-        name: string;
-    }
-    
-==== /a.ts (0 errors) ====
-    import type { User } from "./types.d.ts";
-    export type { User } from "./types.d.ts";
-    
-    export const user: User = { name: "John" };
-    
-    export function getUser(): import("./types.d.ts").User {
-        return user;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=classic).errors.txt b/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=classic).errors.txt
deleted file mode 100644
index 8bac3b2cb1dd0..0000000000000
--- a/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=classic).errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /types.d.ts (0 errors) ====
-    export declare type User = {
-        name: string;
-    }
-    
-==== /a.ts (0 errors) ====
-    import type { User } from "./types.d.ts";
-    export type { User } from "./types.d.ts";
-    
-    export const user: User = { name: "John" };
-    
-    export function getUser(): import("./types.d.ts").User {
-        return user;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index 0b266c9009022..eacd569b3d376 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -12,10 +12,7 @@ export class Foo {
 
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 exports.x = new b_1.default.Foo();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt
deleted file mode 100644
index 7428078159abc..0000000000000
--- a/tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    import Namespace from "./b";
-    export var x = new Namespace.Foo();
-    
-==== b.d.ts (0 errors) ====
-    export class Foo {
-    	member: string;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
index 46ca261dcf94d..127332623a9e8 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
@@ -1,10 +1,6 @@
-error TS5107: Option 'allowSyntheticDefaultImports=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,8): error TS1192: Module '"b"' has no default export.
 
 
-!!! error TS5107: Option 'allowSyntheticDefaultImports=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     import Namespace from "./b";
            ~~~~~~~~~
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index ecd5acabd4757..6816718837a63 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js
@@ -13,10 +13,7 @@ export var x = new Foo();
 
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 exports.x = new b_1.default();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt
deleted file mode 100644
index ff40b5a99bd7d..0000000000000
--- a/tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.d.ts (0 errors) ====
-    declare class Foo {
-    	member: string;
-    }
-    export = Foo;
-    
-==== a.ts (0 errors) ====
-    import Foo from "./b";
-    export var x = new Foo();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
index b046f121d8110..e464ac761f0c3 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
@@ -1,10 +1,6 @@
-error TS5107: Option 'allowSyntheticDefaultImports=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,8): error TS1259: Module '"b"' can only be default-imported using the 'esModuleInterop' flag
 
 
-!!! error TS5107: Option 'allowSyntheticDefaultImports=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.d.ts (0 errors) ====
     declare class Foo {
     	member: string;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports7.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports7.errors.txt
deleted file mode 100644
index 427b9a4ecd4ac..0000000000000
--- a/tests/baselines/reference/allowSyntheticDefaultImports7.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.d.ts (0 errors) ====
-    export function foo();
-    
-    export function bar();
-    
-==== a.ts (0 errors) ====
-    import { default as Foo } from "./b";
-    Foo.bar();
-    Foo.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports7.types b/tests/baselines/reference/allowSyntheticDefaultImports7.types
index 73f1cd2b4faaa..bc2bfa369009c 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports7.types
+++ b/tests/baselines/reference/allowSyntheticDefaultImports7.types
@@ -18,7 +18,6 @@ import { default as Foo } from "./b";
 
 Foo.bar();
 >Foo.bar() : any
->          : ^^^
 >Foo.bar : () => any
 >        : ^^^^^^^^^
 >Foo : typeof Foo
@@ -28,7 +27,6 @@ Foo.bar();
 
 Foo.foo();
 >Foo.foo() : any
->          : ^^^
 >Foo.foo : () => any
 >        : ^^^^^^^^^
 >Foo : typeof Foo
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
index b65de50334d62..4b35802264116 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
@@ -1,10 +1,6 @@
-error TS5107: Option 'allowSyntheticDefaultImports=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
-!!! error TS5107: Option 'allowSyntheticDefaultImports=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.d.ts (0 errors) ====
     export function foo();
     
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js
index 5206974ee1db0..f79bd76c192b9 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js
@@ -12,10 +12,7 @@ Foo.foo();
 
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 b_1.default.bar();
 b_1.default.foo();
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
index 60a00583a8ba9..0de3327533fdb 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.js
@@ -34,9 +34,6 @@ foo(fileText);
 
 //// [user.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 ///<reference path="declarations.d.ts" />
 var foobarbaz_1 = require("foobarbaz");
@@ -44,5 +41,5 @@ var foobarbaz_1 = require("foobarbaz");
 var foosball_1 = require("foosball");
 (0, foobarbaz_1.foo)(foosball_1.foos);
 // Works with relative file name
-var file_text_1 = __importDefault(require("./file!text"));
+var file_text_1 = require("./file!text");
 (0, foobarbaz_1.foo)(file_text_1.default);
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
index f8f07f10a8734..acd76e48f1fae 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
@@ -1,5 +1,5 @@
 ambientExternalModuleInAnotherExternalModule.ts(4,16): error TS2664: Invalid module name in augmentation, module 'ext' cannot be found.
-ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2307: Cannot find module 'ext' or its corresponding type declarations.
+ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2792: Cannot find module 'ext'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== ambientExternalModuleInAnotherExternalModule.ts (2 errors) ====
@@ -15,5 +15,5 @@ ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2307: Cannot find
     // Cannot resolve this ext module reference
     import ext = require("ext");
                          ~~~~~
-!!! error TS2307: Cannot find module 'ext' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'ext'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     var x = ext;
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
index 900b03f321350..09fafb90e70fa 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
@@ -13,13 +13,13 @@ import ext = require("ext");
 var x = ext;
 
 //// [ambientExternalModuleInAnotherExternalModule.js]
-"use strict";
-var D = /** @class */ (function () {
-    function D() {
-    }
+define(["require", "exports", "ext"], function (require, exports, ext) {
+    "use strict";
+    var D = /** @class */ (function () {
+        function D() {
+        }
+        return D;
+    }());
+    var x = ext;
     return D;
-}());
-// Cannot resolve this ext module reference
-var ext = require("ext");
-var x = ext;
-module.exports = D;
+});
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
index e32c911b48c11..cfbcf7edfabcc 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
@@ -4,5 +4,7 @@
 export declare module "M" { }
 
 //// [ambientExternalModuleInsideNonAmbientExternalModule.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.errors.txt b/tests/baselines/reference/ambientExternalModuleMerging.errors.txt
deleted file mode 100644
index e8ff61bebbf4d..0000000000000
--- a/tests/baselines/reference/ambientExternalModuleMerging.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ambientExternalModuleMerging_use.ts (0 errors) ====
-    import M = require("M");
-    // Should be strings
-    var x = M.x;
-    var y = M.y;
-    
-==== ambientExternalModuleMerging_declare.ts (0 errors) ====
-    declare module "M" {
-        export var x: string;
-    }
-    
-    // Merge
-    declare module "M" {
-        export var y: string;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
deleted file mode 100644
index d7fe786ac226a..0000000000000
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ambientExternalModuleWithInternalImportDeclaration_1.ts (0 errors) ====
-    ///<reference path='ambientExternalModuleWithInternalImportDeclaration_0.ts'/>
-    import A = require('M');
-    var c = new A();
-==== ambientExternalModuleWithInternalImportDeclaration_0.ts (0 errors) ====
-    declare module 'M' {
-        namespace C {
-            export var f: number;
-        }
-        class C {
-            foo(): void;
-        }
-        import X = C;
-        export = X;
-    
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
deleted file mode 100644
index 7007f99196d25..0000000000000
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ambientExternalModuleWithoutInternalImportDeclaration_1.ts (0 errors) ====
-    ///<reference path='ambientExternalModuleWithoutInternalImportDeclaration_0.ts'/>
-    import A = require('M');
-    var c = new A();
-==== ambientExternalModuleWithoutInternalImportDeclaration_0.ts (0 errors) ====
-    declare module 'M' {
-        namespace C {
-            export var f: number;
-        }
-        class C {
-            foo(): void;
-        }
-        export = C;
-    
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
deleted file mode 100644
index 894871da4ea76..0000000000000
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ambientInsideNonAmbientExternalModule.ts (0 errors) ====
-    export declare var x;
-    export declare function f();
-    export declare class C { }
-    export declare enum E { }
-    export declare namespace M { }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
index 6738762cf8016..1e4d937001776 100644
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
@@ -3,7 +3,6 @@
 === ambientInsideNonAmbientExternalModule.ts ===
 export declare var x;
 >x : any
->  : ^^^
 
 export declare function f();
 >f : () => any
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index f2ceb3f85ab1a..80c42be439857 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/tests/baselines/reference/ambientShorthand.js
@@ -15,42 +15,9 @@ foo(bar, baz, boom);
 
 //// [user.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 ///<reference path="declarations.d.ts"/>
-var jquery_1 = __importStar(require("jquery"));
-var baz = __importStar(require("fs"));
+var jquery_1 = require("jquery");
+var baz = require("fs");
 var boom = require("jquery");
 (0, jquery_1.default)(jquery_1.bar, baz, boom);
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index fad16379ad344..169d78faa8be2 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -42,41 +42,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("jquery"), exports);
 //// [reExportUser.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var reExportX_1 = require("./reExportX");
-var $ = __importStar(require("./reExportAll"));
+var $ = require("./reExportAll");
 // '$' is not callable, it is an object.
 (0, reExportX_1.x)($);
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
deleted file mode 100644
index 3e48ae27ac125..0000000000000
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== Class.ts (0 errors) ====
-    import { Configurable } from "./Configurable"
-    
-    export class HiddenClass {}
-    
-    export class ActualClass extends Configurable(HiddenClass) {}
-==== Configurable.ts (0 errors) ====
-    export type Constructor<T> = {
-        new(...args: any[]): T;
-    }
-    export function Configurable<T extends Constructor<{}>>(base: T): T {
-        return class extends base {
-    
-            constructor(...args: any[]) {
-                super(...args);
-            }
-    
-        };
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
index a4b3790832021..298d9b7a59a76 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
@@ -50,7 +50,6 @@ export function Configurable<T extends Constructor<{}>>(base: T): T {
 >super : T
 >      : ^
 >...args : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
         }
diff --git a/tests/baselines/reference/amdDependencyComment2.errors.txt b/tests/baselines/reference/amdDependencyComment2.errors.txt
index f9f56d78b0572..535952ab28c83 100644
--- a/tests/baselines/reference/amdDependencyComment2.errors.txt
+++ b/tests/baselines/reference/amdDependencyComment2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 amdDependencyComment2.ts(3,21): error TS2792: Cannot find module 'm2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== amdDependencyComment2.ts (1 errors) ====
     ///<amd-dependency path='bar'/>
     
diff --git a/tests/baselines/reference/amdDependencyCommentName2.errors.txt b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
index 5493fec22e1f8..0efc3677edaae 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 amdDependencyCommentName2.ts(3,21): error TS2792: Cannot find module 'm2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== amdDependencyCommentName2.ts (1 errors) ====
     ///<amd-dependency path='bar' name='b'/>
     
diff --git a/tests/baselines/reference/amdDependencyCommentName3.errors.txt b/tests/baselines/reference/amdDependencyCommentName3.errors.txt
index 9dc61a72ac698..da2433c64e3ce 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName3.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 amdDependencyCommentName3.ts(5,21): error TS2792: Cannot find module 'm2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== amdDependencyCommentName3.ts (1 errors) ====
     ///<amd-dependency path='bar' name='b'/>
     ///<amd-dependency path='foo'/>
diff --git a/tests/baselines/reference/amdDependencyCommentName4.errors.txt b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
index 369eab8b94545..dde817520208f 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 amdDependencyCommentName4.ts(6,8): error TS2882: Cannot find module or type declarations for side-effect import of 'unaliasedModule1'.
 amdDependencyCommentName4.ts(8,21): error TS2792: Cannot find module 'aliasedModule1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 amdDependencyCommentName4.ts(11,26): error TS2792: Cannot find module 'aliasedModule2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -7,7 +6,6 @@ amdDependencyCommentName4.ts(17,21): error TS2792: Cannot find module 'aliasedMo
 amdDependencyCommentName4.ts(20,8): error TS2882: Cannot find module or type declarations for side-effect import of 'unaliasedModule2'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== amdDependencyCommentName4.ts (6 errors) ====
     ///<amd-dependency path='aliasedModule5' name='n1'/>
     ///<amd-dependency path='unaliasedModule3'/>
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index d146f7b92246a..99baf7967226e 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -27,47 +27,9 @@ import "unaliasedModule2";
 ///<amd-dependency path='unaliasedModule3'/>
 ///<amd-dependency path='aliasedModule6' name='n2'/>
 ///<amd-dependency path='unaliasedModule4'/>
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    aliasedModule3_1 = __importDefault(aliasedModule3_1);
-    ns = __importStar(ns);
     r1;
     aliasedModule2_1.p1;
     aliasedModule3_1.default;
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt b/tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt
deleted file mode 100644
index db2e8f43f2559..0000000000000
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    if(foo.E1.A === 0){
-    	// Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
-    }
-    
-==== foo_0.ts (0 errors) ====
-    export enum E1 {
-    	A,B,C
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt b/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
deleted file mode 100644
index 2384ff62cf093..0000000000000
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    // None of the below should cause a runtime dependency on foo_0
-    import f = foo.M1;
-    var i: f.I2;
-    var x: foo.C1 = <{m1: number}>{};
-    var y: typeof foo.C1.s1 = false;
-    var z: foo.M1.I2;
-    var e: number = <foo.E1>0;
-==== foo_0.ts (0 errors) ====
-    export class C1 {
-    	m1 = 42;
-    	static s1 = true;
-    }
-    
-    export interface I1 {
-    	name: string;
-    	age: number;
-    }
-    
-    export namespace M1 {
-    	export interface I2 {
-    		foo: string;
-    	}
-    }
-    
-    export enum E1 {
-    	A,B,C
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt b/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
deleted file mode 100644
index a0f10142a0010..0000000000000
--- a/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    /// <amd-module name="mynamespace::SomeModuleA" />
-    export class Foo {}
-==== file2.ts (0 errors) ====
-    /// <amd-module name="mynamespace::SomeModuleB" />
-    export class Bar {}
\ No newline at end of file
diff --git a/tests/baselines/reference/amdModuleConstEnumUsage.errors.txt b/tests/baselines/reference/amdModuleConstEnumUsage.errors.txt
index c481c51265ae0..684438a321e98 100644
--- a/tests/baselines/reference/amdModuleConstEnumUsage.errors.txt
+++ b/tests/baselines/reference/amdModuleConstEnumUsage.errors.txt
@@ -1,11 +1,9 @@
 error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /proj/defs/cc.ts (0 errors) ====
     export const enum CharCode {
         A,
diff --git a/tests/baselines/reference/amdModuleName1.errors.txt b/tests/baselines/reference/amdModuleName1.errors.txt
deleted file mode 100644
index 93c4eee9c3022..0000000000000
--- a/tests/baselines/reference/amdModuleName1.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== amdModuleName1.ts (0 errors) ====
-    ///<amd-module name='NamedModule'/>
-    class Foo {
-        x: number;
-        constructor() {
-            this.x = 5;
-        }
-    }
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/amdModuleName2.errors.txt b/tests/baselines/reference/amdModuleName2.errors.txt
index fea86f1230c6e..90f9378392567 100644
--- a/tests/baselines/reference/amdModuleName2.errors.txt
+++ b/tests/baselines/reference/amdModuleName2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 amdModuleName2.ts(2,1): error TS2458: An AMD module cannot have multiple name assignments.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== amdModuleName2.ts (1 errors) ====
     ///<amd-module name='FirstModuleName'/>
     ///<amd-module name='SecondModuleName'/>
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.errors.txt b/tests/baselines/reference/anonymousDefaultExportsAmd.errors.txt
deleted file mode 100644
index d13e1332035a7..0000000000000
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class {}
-    
-==== b.ts (0 errors) ====
-    export default function() {}
\ No newline at end of file
diff --git a/tests/baselines/reference/anonymousDefaultExportsSystem.errors.txt b/tests/baselines/reference/anonymousDefaultExportsSystem.errors.txt
deleted file mode 100644
index af3ae9e2beff6..0000000000000
--- a/tests/baselines/reference/anonymousDefaultExportsSystem.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class {}
-    
-==== b.ts (0 errors) ====
-    export default function() {}
\ No newline at end of file
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.errors.txt b/tests/baselines/reference/anonymousDefaultExportsUmd.errors.txt
deleted file mode 100644
index d2f8b0010b34b..0000000000000
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class {}
-    
-==== b.ts (0 errors) ====
-    export default function() {}
\ No newline at end of file
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index ba6404355b3c3..ec624a12be559 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -6944,7 +6944,6 @@ declare namespace ts {
         Message = 3,
     }
     enum ModuleResolutionKind {
-        /** @deprecated */
         Classic = 1,
         /**
          * @deprecated
@@ -7148,14 +7147,10 @@ declare namespace ts {
         [option: string]: CompilerOptionsValue | undefined;
     }
     enum ModuleKind {
-        /** @deprecated */
         None = 0,
         CommonJS = 1,
-        /** @deprecated */
         AMD = 2,
-        /** @deprecated */
         UMD = 3,
-        /** @deprecated */
         System = 4,
         ES2015 = 5,
         ES2020 = 6,
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).errors.txt b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).errors.txt
index f8d94084906b3..cc359bceb4904 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 arbitraryModuleNamespaceIdentifiers_module.ts(20,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(24,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(29,7): error TS2322: Type '"expect error about otherType"' is not assignable to type '"otherType"'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== arbitraryModuleNamespaceIdentifiers_module.ts (3 errors) ====
     const someValue = "someValue";
     type someType = "someType";
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js
index 8461dbb329837..1a72c31df4c08 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js
@@ -33,39 +33,6 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
 
 
 //// [arbitraryModuleNamespaceIdentifiers_module.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "./arbitraryModuleNamespaceIdentifiers_module", "./arbitraryModuleNamespaceIdentifiers_module", "./arbitraryModuleNamespaceIdentifiers_module", "./arbitraryModuleNamespaceIdentifiers_module", "./arbitraryModuleNamespaceIdentifiers_module"], function (require, exports, arbitraryModuleNamespaceIdentifiers_module_1, arbitraryModuleNamespaceIdentifiers_module_2, arbitraryModuleNamespaceIdentifiers_module_3, arbitraryModuleNamespaceIdentifiers_module_4, arbitraryModuleNamespaceIdentifiers_module_5) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -77,7 +44,7 @@ define(["require", "exports", "./arbitraryModuleNamespaceIdentifiers_module", ".
     Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
     if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
         throw "should be someValue";
-    exports["<Z>"] = __importStar(arbitraryModuleNamespaceIdentifiers_module_4);
+    exports["<Z>"] = arbitraryModuleNamespaceIdentifiers_module_4;
     if (arbitraryModuleNamespaceIdentifiers_module_5["<Z>"]["<X>"] !== "someValue")
         throw "should be someValue";
     if (arbitraryModuleNamespaceIdentifiers_module_5["<Z>"]["<Y>"] !== "someValue")
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js
index 311a983aea48a..43f95451590dc 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js
@@ -34,39 +34,6 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
 
 //// [arbitraryModuleNamespaceIdentifiers_module.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
 const someValue = "someValue";
@@ -79,7 +46,7 @@ Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { ret
 const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
 if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
     throw "should be someValue";
-exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
+exports["<Z>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
 const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
 if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
     throw "should be someValue";
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt
index 137bc8405d91d..cc359bceb4904 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 arbitraryModuleNamespaceIdentifiers_module.ts(20,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(24,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(29,7): error TS2322: Type '"expect error about otherType"' is not assignable to type '"otherType"'.
 
 
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== arbitraryModuleNamespaceIdentifiers_module.ts (3 errors) ====
     const someValue = "someValue";
     type someType = "someType";
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js
index 311a983aea48a..43f95451590dc 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js
@@ -34,39 +34,6 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
 
 //// [arbitraryModuleNamespaceIdentifiers_module.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
 const someValue = "someValue";
@@ -79,7 +46,7 @@ Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { ret
 const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
 if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
     throw "should be someValue";
-exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
+exports["<Z>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
 const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
 if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
     throw "should be someValue";
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt
index 3fdb570adabf4..cc359bceb4904 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 arbitraryModuleNamespaceIdentifiers_module.ts(20,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(24,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(29,7): error TS2322: Type '"expect error about otherType"' is not assignable to type '"otherType"'.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== arbitraryModuleNamespaceIdentifiers_module.ts (3 errors) ====
     const someValue = "someValue";
     type someType = "someType";
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).errors.txt b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).errors.txt
index 325deca6f6eac..cc359bceb4904 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 arbitraryModuleNamespaceIdentifiers_module.ts(20,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(24,7): error TS2322: Type '"expect error about someType"' is not assignable to type '"someType"'.
 arbitraryModuleNamespaceIdentifiers_module.ts(29,7): error TS2322: Type '"expect error about otherType"' is not assignable to type '"otherType"'.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== arbitraryModuleNamespaceIdentifiers_module.ts (3 errors) ====
     const someValue = "someValue";
     type someType = "someType";
diff --git a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js
index 2f250d99bce84..a21466756821c 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js
@@ -33,39 +33,6 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
 
 
 //// [arbitraryModuleNamespaceIdentifiers_module.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -88,7 +55,7 @@ var __importStar = (this && this.__importStar) || (function () {
     const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
     if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
         throw "should be someValue";
-    exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
+    exports["<Z>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
     const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
     if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
         throw "should be someValue";
diff --git a/tests/baselines/reference/assertionFunctionWildcardImport1.js b/tests/baselines/reference/assertionFunctionWildcardImport1.js
index 7061098dba010..ba5b209818f6a 100644
--- a/tests/baselines/reference/assertionFunctionWildcardImport1.js
+++ b/tests/baselines/reference/assertionFunctionWildcardImport1.js
@@ -33,80 +33,14 @@ Debug.assert(true);
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [ts.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Debug = void 0;
-var Debug = __importStar(require("../debug"));
+var Debug = require("../debug");
 exports.Debug = Debug;
 //// [foo.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = __importStar(require("./_namespaces/ts"));
+var ts = require("./_namespaces/ts");
 var ts_1 = require("./_namespaces/ts");
 ts.Debug.assert(true);
 ts_1.Debug.assert(true);
@@ -130,41 +64,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("../../core/_namespaces/ts"), exports);
 //// [bar.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = __importStar(require("./_namespaces/ts"));
+var ts = require("./_namespaces/ts");
 var ts_1 = require("./_namespaces/ts");
 ts.Debug.assert(true);
 ts_1.Debug.assert(true);
diff --git a/tests/baselines/reference/assertionFunctionWildcardImport2.js b/tests/baselines/reference/assertionFunctionWildcardImport2.js
index 21014a3b2ce1f..4d1beeec12f3c 100644
--- a/tests/baselines/reference/assertionFunctionWildcardImport2.js
+++ b/tests/baselines/reference/assertionFunctionWildcardImport2.js
@@ -31,41 +31,8 @@ function isNonNullable(obj) {
 }
 //// [test.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var asserts = __importStar(require("./asserts"));
+var asserts = require("./asserts");
 function test(obj) {
     asserts.isNonNullable(obj);
     obj.trim();
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt
index 69472d04e58b4..93968de52c1af 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt
@@ -1,10 +1,10 @@
-asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
+asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== asyncAwaitIsolatedModules_es2017.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     declare var p: Promise<number>;
     declare var mp: MyPromise<number>;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt
index aa1e25b06ecb1..9393895d1ae64 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt
@@ -1,10 +1,10 @@
-asyncAwaitIsolatedModules_es6.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
+asyncAwaitIsolatedModules_es6.ts(1,27): error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== asyncAwaitIsolatedModules_es6.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     declare var p: Promise<number>;
     declare var mp: MyPromise<number>;
diff --git a/tests/baselines/reference/asyncImportNestedYield.js b/tests/baselines/reference/asyncImportNestedYield.js
index 81ffe76523fa8..a6251abe5203d 100644
--- a/tests/baselines/reference/asyncImportNestedYield.js
+++ b/tests/baselines/reference/asyncImportNestedYield.js
@@ -6,39 +6,6 @@ async function* foo() {
 }
 
 //// [asyncImportNestedYield.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __generator = (this && this.__generator) || function (thisArg, body) {
     var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
     return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
@@ -85,9 +52,9 @@ function foo() {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, __await("foo")];
                 case 1: return [4 /*yield*/, _a.sent()];
-                case 2: return [4 /*yield*/, __await.apply(void 0, [Promise.resolve("".concat(_a.sent())).then(function (s) { return __importStar(require(s)); })])];
+                case 2: return [4 /*yield*/, __await.apply(void 0, [Promise.resolve("".concat(_a.sent())).then(function (s) { return require(s); })])];
                 case 3:
-                    Promise.resolve("".concat((_a.sent()).default)).then(function (s) { return __importStar(require(s)); });
+                    Promise.resolve("".concat((_a.sent()).default)).then(function (s) { return require(s); });
                     return [2 /*return*/];
             }
         });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index 6bc25d7e71bc1..4fa10b893d7e1 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -19,14 +19,19 @@ import "./file2";
 let a: x.A; // should not work
 
 //// [file1.js]
-"use strict";
-var x = 1;
-module.exports = x;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var x = 1;
+    return x;
+});
 //// [file2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
 //// [file3.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("./file2");
-var a; // should not work
+define(["require", "exports", "./file2"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a; // should not work
+});
diff --git a/tests/baselines/reference/augmentExportEquals1_1.errors.txt b/tests/baselines/reference/augmentExportEquals1_1.errors.txt
index 67a0cb5a1c6b0..2d4719c215c6a 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.errors.txt
+++ b/tests/baselines/reference/augmentExportEquals1_1.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file2.ts(6,16): error TS2671: Cannot augment module 'file1' because it resolves to a non-module entity.
 file3.ts(3,8): error TS2503: Cannot find namespace 'x'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file3.ts (1 errors) ====
     import x = require("file1");
     import "file2";
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index e565f18dd087a..7f3a825133794 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -18,14 +18,19 @@ import "./file2";
 let a: x.A; // should not work
 
 //// [file1.js]
-"use strict";
-function foo() { }
-module.exports = foo;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    function foo() { }
+    return foo;
+});
 //// [file2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
 //// [file3.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("./file2");
-var a; // should not work
+define(["require", "exports", "./file2"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a; // should not work
+});
diff --git a/tests/baselines/reference/augmentExportEquals2_1.errors.txt b/tests/baselines/reference/augmentExportEquals2_1.errors.txt
index bb0f4e78d9ccf..f03369da40d65 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.errors.txt
+++ b/tests/baselines/reference/augmentExportEquals2_1.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file2.ts(5,16): error TS2671: Cannot augment module 'file1' because it resolves to a non-module entity.
 file3.ts(3,8): error TS2503: Cannot find namespace 'x'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file3.ts (1 errors) ====
     import x = require("file1");
     import "file2";
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 7f07f319f774f..82ed6ddc3b57c 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -24,54 +24,24 @@ let a: x.A;
 let b = x.b;
 
 //// [file1.js]
-"use strict";
-function foo() { }
-(function (foo) {
-    foo.v = 1;
-})(foo || (foo = {}));
-module.exports = foo;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    function foo() { }
+    (function (foo) {
+        foo.v = 1;
+    })(foo || (foo = {}));
+    return foo;
+});
 //// [file2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var x = require("./file1");
-x.b = 1;
+define(["require", "exports", "./file1"], function (require, exports, x) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    x.b = 1;
+});
 //// [file3.js]
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a;
+    var b = x.b;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var x = __importStar(require("./file1"));
-require("./file2");
-var a;
-var b = x.b;
diff --git a/tests/baselines/reference/augmentExportEquals3_1.errors.txt b/tests/baselines/reference/augmentExportEquals3_1.errors.txt
deleted file mode 100644
index dbcff1cce46e3..0000000000000
--- a/tests/baselines/reference/augmentExportEquals3_1.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.d.ts (0 errors) ====
-    declare module "file1" {
-        function foo(): void;
-        namespace foo {
-            export var v: number;
-        }
-        export = foo;
-    }
-    
-    
-==== file2.ts (0 errors) ====
-    /// <reference path="file1.d.ts"/>
-    import x = require("file1"); 
-    x.b = 1;
-    
-    // OK - './file1' is a namespace
-    declare module "file1" {
-        interface A { a }
-        let b: number;
-    }
-    
-==== file3.ts (0 errors) ====
-    import * as x from "file1";
-    import "file2";
-    let a: x.A;
-    let b = x.b;
\ No newline at end of file
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index 02af1776b5216..a644d08286b4f 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/tests/baselines/reference/augmentExportEquals3_1.js
@@ -34,43 +34,9 @@ define(["require", "exports", "file1"], function (require, exports, x) {
     x.b = 1;
 });
 //// [file3.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    x = __importStar(x);
     var a;
     var b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
index 0cb8ad7e4c188..684978016dd03 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.types
+++ b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -48,7 +48,6 @@ declare module "file1" {
 
     interface A { a }
 >a : any
->  : ^^^
 
     let b: number;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index fd55f8017fcb1..8ff96bf339119 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -24,58 +24,28 @@ let a: x.A;
 let b = x.b;
 
 //// [file1.js]
-"use strict";
-var foo = /** @class */ (function () {
-    function foo() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var foo = /** @class */ (function () {
+        function foo() {
+        }
+        return foo;
+    }());
+    (function (foo) {
+        foo.v = 1;
+    })(foo || (foo = {}));
     return foo;
-}());
-(function (foo) {
-    foo.v = 1;
-})(foo || (foo = {}));
-module.exports = foo;
+});
 //// [file2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var x = require("./file1");
-x.b = 1;
+define(["require", "exports", "./file1"], function (require, exports, x) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    x.b = 1;
+});
 //// [file3.js]
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a;
+    var b = x.b;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var x = __importStar(require("./file1"));
-require("./file2");
-var a;
-var b = x.b;
diff --git a/tests/baselines/reference/augmentExportEquals4_1.errors.txt b/tests/baselines/reference/augmentExportEquals4_1.errors.txt
deleted file mode 100644
index 138b715c5122d..0000000000000
--- a/tests/baselines/reference/augmentExportEquals4_1.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.d.ts (0 errors) ====
-    declare module "file1" {
-        class foo {}
-        namespace foo {
-            export var v: number;
-        }
-        export = foo;
-    }
-    
-    
-==== file2.ts (0 errors) ====
-    /// <reference path="file1.d.ts"/>
-    import x = require("file1"); 
-    x.b = 1;
-    
-    // OK - './file1' is a namespace
-    declare module "file1" {
-        interface A { a }
-        let b: number;
-    }
-    
-==== file3.ts (0 errors) ====
-    import * as x from "file1";
-    import "file2";
-    let a: x.A;
-    let b = x.b;
\ No newline at end of file
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index f17e1ae069a6e..1b0c4a028a4a2 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/tests/baselines/reference/augmentExportEquals4_1.js
@@ -34,43 +34,9 @@ define(["require", "exports", "file1"], function (require, exports, x) {
     x.b = 1;
 });
 //// [file3.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    x = __importStar(x);
     var a;
     var b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
index 564b3a9d55e58..fddef2aaacf91 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.types
+++ b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -48,7 +48,6 @@ declare module "file1" {
 
     interface A { a }
 >a : any
->  : ^^^
 
     let b: number;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index 70efe35ff7f67..03ef32a071954 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/tests/baselines/reference/augmentExportEquals5.js
@@ -81,11 +81,14 @@ let x: Request;
 const y = x.id;
 
 //// [augmentation.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
 //// [consumer.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("./augmentation");
-var x;
-var y = x.id;
+define(["require", "exports", "./augmentation"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var x;
+    var y = x.id;
+});
diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
index bccab4f9d160e..c03444303beef 100644
--- a/tests/baselines/reference/augmentExportEquals5.types
+++ b/tests/baselines/reference/augmentExportEquals5.types
@@ -140,8 +140,8 @@ import * as e from "express";
 >  : ^^^^^^^^
 
 declare module "express" {
->"express" : typeof import("express")
->          : ^^^^^^^^^^^^^^^^^^^^^^^^
+>"express" : typeof e
+>          : ^^^^^^^^
 
     interface Request {
         id: number;
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 5dc782ed8552e..193334842c348 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -28,67 +28,37 @@ let b = a.a;
 let c = x.B.b;
 
 //// [file1.js]
-"use strict";
-var foo = /** @class */ (function () {
-    function foo() {
-    }
-    return foo;
-}());
-(function (foo) {
-    var A = /** @class */ (function () {
-        function A() {
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var foo = /** @class */ (function () {
+        function foo() {
         }
-        return A;
+        return foo;
     }());
-    foo.A = A;
-    var B;
-    (function (B) {
-    })(B = foo.B || (foo.B = {}));
-})(foo || (foo = {}));
-module.exports = foo;
+    (function (foo) {
+        var A = /** @class */ (function () {
+            function A() {
+            }
+            return A;
+        }());
+        foo.A = A;
+        var B;
+        (function (B) {
+        })(B = foo.B || (foo.B = {}));
+    })(foo || (foo = {}));
+    return foo;
+});
 //// [file2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var x = require("./file1");
-x.B.b = 1;
+define(["require", "exports", "./file1"], function (require, exports, x) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    x.B.b = 1;
+});
 //// [file3.js]
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a;
+    var b = a.a;
+    var c = x.B.b;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var x = __importStar(require("./file1"));
-require("./file2");
-var a;
-var b = a.a;
-var c = x.B.b;
diff --git a/tests/baselines/reference/augmentExportEquals6_1.errors.txt b/tests/baselines/reference/augmentExportEquals6_1.errors.txt
deleted file mode 100644
index 3afd16d251826..0000000000000
--- a/tests/baselines/reference/augmentExportEquals6_1.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.d.ts (0 errors) ====
-    declare module "file1" {
-        class foo {}
-        namespace foo {
-            class A {}
-        }
-        export = foo;
-    }
-    
-    
-==== file2.ts (0 errors) ====
-    /// <reference path="file1.d.ts"/>
-    import x = require("file1"); 
-    
-    // OK - './file1' is a namespace
-    declare module "file1" {
-        interface A { a: number }
-    }
-    
-==== file3.ts (0 errors) ====
-    import * as x from "file1";
-    import "file2";
-    let a: x.A;
-    let b = a.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/augmentExportEquals7.types b/tests/baselines/reference/augmentExportEquals7.types
index 67e1a8200cf54..1d8d7be621a32 100644
--- a/tests/baselines/reference/augmentExportEquals7.types
+++ b/tests/baselines/reference/augmentExportEquals7.types
@@ -12,8 +12,8 @@ export = lib;
 
 === /node_modules/@types/lib-extender/index.d.ts ===
 import * as lib from "lib";
->lib : { default: () => void; }
->    : ^^^^^^^^^^^^^^^^^    ^^^
+>lib : () => void
+>    : ^^^^^^    
 
 declare module "lib" {
 >"lib" : typeof import("lib")
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt b/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
deleted file mode 100644
index ebcf0f2eb2e4a..0000000000000
--- a/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== augmentedTypesExternalModule1.ts (0 errors) ====
-    export var a = 1;
-    class c5 { public foo() { } }
-    namespace c5 { } // should be ok everywhere
\ No newline at end of file
diff --git a/tests/baselines/reference/autoAccessorDisallowedModifiers(target=es2017).errors.txt b/tests/baselines/reference/autoAccessorDisallowedModifiers(target=es2017).errors.txt
index e9a61f9407b9c..666dd521e5f15 100644
--- a/tests/baselines/reference/autoAccessorDisallowedModifiers(target=es2017).errors.txt
+++ b/tests/baselines/reference/autoAccessorDisallowedModifiers(target=es2017).errors.txt
@@ -25,7 +25,7 @@ autoAccessorDisallowedModifiers.ts(33,1): error TS1275: 'accessor' modifier can
 autoAccessorDisallowedModifiers.ts(34,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(34,17): error TS2882: Cannot find module or type declarations for side-effect import of 'x'.
 autoAccessorDisallowedModifiers.ts(35,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
-autoAccessorDisallowedModifiers.ts(35,25): error TS2307: Cannot find module 'x' or its corresponding type declarations.
+autoAccessorDisallowedModifiers.ts(35,25): error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 autoAccessorDisallowedModifiers.ts(36,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(37,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
@@ -122,7 +122,7 @@ autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can
     ~~~~~~~~
 !!! error TS1275: 'accessor' modifier can only appear on a property declaration.
                             ~~~
-!!! error TS2307: Cannot find module 'x' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     accessor export { V1 };
     ~~~~~~~~
 !!! error TS1275: 'accessor' modifier can only appear on a property declaration.
diff --git a/tests/baselines/reference/autoAccessorDisallowedModifiers(target=esnext).errors.txt b/tests/baselines/reference/autoAccessorDisallowedModifiers(target=esnext).errors.txt
index e9a61f9407b9c..666dd521e5f15 100644
--- a/tests/baselines/reference/autoAccessorDisallowedModifiers(target=esnext).errors.txt
+++ b/tests/baselines/reference/autoAccessorDisallowedModifiers(target=esnext).errors.txt
@@ -25,7 +25,7 @@ autoAccessorDisallowedModifiers.ts(33,1): error TS1275: 'accessor' modifier can
 autoAccessorDisallowedModifiers.ts(34,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(34,17): error TS2882: Cannot find module or type declarations for side-effect import of 'x'.
 autoAccessorDisallowedModifiers.ts(35,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
-autoAccessorDisallowedModifiers.ts(35,25): error TS2307: Cannot find module 'x' or its corresponding type declarations.
+autoAccessorDisallowedModifiers.ts(35,25): error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 autoAccessorDisallowedModifiers.ts(36,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(37,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
@@ -122,7 +122,7 @@ autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can
     ~~~~~~~~
 !!! error TS1275: 'accessor' modifier can only appear on a property declaration.
                             ~~~
-!!! error TS2307: Cannot find module 'x' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     accessor export { V1 };
     ~~~~~~~~
 !!! error TS1275: 'accessor' modifier can only appear on a property declaration.
diff --git a/tests/baselines/reference/awaitUsingDeclarationsTopLevelOfModule.1(module=system).errors.txt b/tests/baselines/reference/awaitUsingDeclarationsTopLevelOfModule.1(module=system).errors.txt
deleted file mode 100644
index a07b1781038df..0000000000000
--- a/tests/baselines/reference/awaitUsingDeclarationsTopLevelOfModule.1(module=system).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== awaitUsingDeclarationsTopLevelOfModule.1.ts (0 errors) ====
-    export const x = 1;
-    export { y };
-    
-    await using z = { async [Symbol.asyncDispose]() {} };
-    
-    const y = 2;
-    
-    export const w = 3;
-    
-    export default 4;
-    
-    console.log(w, x, y, z);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/badExternalModuleReference.errors.txt b/tests/baselines/reference/badExternalModuleReference.errors.txt
index 3e8f3872296e5..ade3bfb43c0f7 100644
--- a/tests/baselines/reference/badExternalModuleReference.errors.txt
+++ b/tests/baselines/reference/badExternalModuleReference.errors.txt
@@ -1,10 +1,10 @@
-badExternalModuleReference.ts(1,21): error TS2307: Cannot find module 'garbage' or its corresponding type declarations.
+badExternalModuleReference.ts(1,21): error TS2792: Cannot find module 'garbage'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== badExternalModuleReference.ts (1 errors) ====
     import a1 = require("garbage");
                         ~~~~~~~~~
-!!! error TS2307: Cannot find module 'garbage' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'garbage'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     export declare var a: {
         test1: a1.connectModule;
         (): a1.connectExport;
diff --git a/tests/baselines/reference/badExternalModuleReference.js b/tests/baselines/reference/badExternalModuleReference.js
index 017e5d940fb2c..4f5d7e4cc2d8a 100644
--- a/tests/baselines/reference/badExternalModuleReference.js
+++ b/tests/baselines/reference/badExternalModuleReference.js
@@ -9,5 +9,7 @@ export declare var a: {
 
 
 //// [badExternalModuleReference.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
diff --git a/tests/baselines/reference/bangInModuleName.errors.txt b/tests/baselines/reference/bangInModuleName.errors.txt
deleted file mode 100644
index 779592b870ea1..0000000000000
--- a/tests/baselines/reference/bangInModuleName.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    /// <reference path="a.d.ts"/>
-    
-    import * as http from 'intern/dojo/node!http';
-==== a.d.ts (0 errors) ====
-    declare module "http" {
-    }
-    
-    declare module 'intern/dojo/node!http' {
-        import http = require('http');
-        export = http;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
index f958ba0e0570a..175fd5671a294 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
@@ -1,9 +1,12 @@
+blockScopedFunctionDeclarationInStrictModule.ts(2,14): error TS1252: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'. Modules are automatically in strict mode.
 blockScopedFunctionDeclarationInStrictModule.ts(6,10): error TS2304: Cannot find name 'foo'.
 
 
-==== blockScopedFunctionDeclarationInStrictModule.ts (1 errors) ====
+==== blockScopedFunctionDeclarationInStrictModule.ts (2 errors) ====
     if (true) {
         function foo() { }
+                 ~~~
+!!! error TS1252: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'. Modules are automatically in strict mode.
         foo(); // ok
     }
     
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
index e7c00bb07a24b..512bc5d032753 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
@@ -9,9 +9,11 @@ if (true) {
 export = foo; // not ok
 
 //// [blockScopedFunctionDeclarationInStrictModule.js]
-"use strict";
-if (true) {
-    function foo() { }
-    foo(); // ok
-}
-module.exports = foo;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    if (true) {
+        function foo() { }
+        foo(); // ok
+    }
+    return foo;
+});
diff --git a/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt b/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
deleted file mode 100644
index fa5f3d7a5cc72..0000000000000
--- a/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    namespace C {
-        export class Name {
-            static funcData = A.AA.func();
-            static someConst = A.AA.foo;
-    
-            constructor(parameters) {}
-        }
-    }
-    
-==== typings.d.ts (0 errors) ====
-    declare namespace A {
-        namespace AA {
-            function func(): number;
-            const foo = "";
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedNamespaceDifferentFile.types b/tests/baselines/reference/blockScopedNamespaceDifferentFile.types
index e64b0e174c0e6..e5529ff6a51f7 100644
--- a/tests/baselines/reference/blockScopedNamespaceDifferentFile.types
+++ b/tests/baselines/reference/blockScopedNamespaceDifferentFile.types
@@ -41,7 +41,6 @@ namespace C {
 
         constructor(parameters) {}
 >parameters : any
->           : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/cacheResolutions.errors.txt b/tests/baselines/reference/cacheResolutions.errors.txt
deleted file mode 100644
index 99544b47178b5..0000000000000
--- a/tests/baselines/reference/cacheResolutions.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /a/b/c/app.ts (0 errors) ====
-    export let x = 1;
-    
-==== /a/b/c/lib1.ts (0 errors) ====
-    export let x = 1;
-    
-==== /a/b/c/lib2.ts (0 errors) ====
-    export let x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution3.errors.txt b/tests/baselines/reference/cachedModuleResolution3.errors.txt
deleted file mode 100644
index a215118639b4d..0000000000000
--- a/tests/baselines/reference/cachedModuleResolution3.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /a/b/foo.d.ts (0 errors) ====
-    export declare let x: number
-    
-==== /a/b/c/d/e/app.ts (0 errors) ====
-    import {x} from "foo";
-    
-==== /a/b/c/lib.ts (0 errors) ====
-    import {x} from "foo";
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution4.errors.txt b/tests/baselines/reference/cachedModuleResolution4.errors.txt
deleted file mode 100644
index dbee47cdf6822..0000000000000
--- a/tests/baselines/reference/cachedModuleResolution4.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /a/b/foo.d.ts (0 errors) ====
-    export declare let x: number
-    
-==== /a/b/c/lib.ts (0 errors) ====
-    import {x} from "foo";
-    
-==== /a/b/c/d/e/app.ts (0 errors) ====
-    import {x} from "foo";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/cachedModuleResolution8.errors.txt b/tests/baselines/reference/cachedModuleResolution8.errors.txt
index c507bb0e52655..454954606fd73 100644
--- a/tests/baselines/reference/cachedModuleResolution8.errors.txt
+++ b/tests/baselines/reference/cachedModuleResolution8.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /a/b/c/d/e/app.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 /a/b/c/lib.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a/b/c/d/e/app.ts (1 errors) ====
     import {x} from "foo";
                     ~~~~~
diff --git a/tests/baselines/reference/cachedModuleResolution9.errors.txt b/tests/baselines/reference/cachedModuleResolution9.errors.txt
index 73ac6316facb1..5c56ae758db02 100644
--- a/tests/baselines/reference/cachedModuleResolution9.errors.txt
+++ b/tests/baselines/reference/cachedModuleResolution9.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /a/b/c/d/e/app.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 /a/b/c/lib.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a/b/c/lib.ts (1 errors) ====
     import {x} from "foo";
                     ~~~~~
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.errors.txt b/tests/baselines/reference/capturedLetConstInLoop4.errors.txt
deleted file mode 100644
index 8c5a24ed95a1c..0000000000000
--- a/tests/baselines/reference/capturedLetConstInLoop4.errors.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== capturedLetConstInLoop4.ts (0 errors) ====
-    //======let
-    export function exportedFoo() {
-        return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
-    }
-    
-    for (let x of []) {
-        var v0 = x;
-        (function() { return x + v0});
-        (() => x);    
-    }
-    
-    for (let x in []) {
-        var v00 = x;
-        (function() { return x + v00});
-        (() => x);    
-    }
-    
-    for (let x = 0; x < 1; ++x) {
-        var v1 = x;
-        (function() { return x + v1});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        let x;
-        var v2 = x;
-        (function() { return x + v2});
-        (() => x);
-    }
-    
-    do {
-        let x;
-        var v3 = x;
-        (function() { return x + v3});
-        (() => x);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        var v4 = x;
-        (function() { return x + v4});
-        (() => x);
-    }
-    
-    for (let x = 0, y = 1; x < 1; ++x) {
-        var v5 = x;
-        (function() { return x + y + v5});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        let x, y;
-        var v6 = x;
-        (function() { return x + y + v6});
-        (() => x + y);
-    }
-    
-    do {
-        let x, y;
-        var v7 = x;
-        (function() { return x + y + v7});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        var v8 = x;
-        (function() { return x + y + v8});
-        (() => x + y);
-    }
-    
-    //======const
-    export function exportedFoo2() {
-        return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
-    }
-    
-    for (const x of []) {
-        var v0_c = x;
-        (function() { return x + v0_c});
-        (() => x);    
-    }
-    
-    for (const x in []) {
-        var v00_c = x;
-        (function() { return x + v00});
-        (() => x);    
-    }
-    
-    for (const x = 0; x < 1;) {
-        var v1_c = x;
-        (function() { return x + v1_c});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        const x =1;
-        var v2_c = x;
-        (function() { return x + v2_c});
-        (() => x);
-    }
-    
-    do {
-        const x = 1;
-        var v3_c = x;
-        (function() { return x + v3_c});
-        (() => x);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-        const x = 1;
-        var v4_c = x;
-        (function() { return x + v4_c});
-        (() => x);
-    }
-    
-    for (const x = 0, y = 1; x < 1;) {
-        var v5_c = x;
-        (function() { return x + y + v5_c});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        const x = 1, y = 1;
-        var v6_c = x;
-        (function() { return x + y + v6_c});
-        (() => x + y);
-    }
-    
-    do {
-        const x = 1, y = 1;
-        var v7_c = x;
-        (function() { return x + y + v7_c});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-        const x = 1;
-        var v8_c = x;
-        (function() { return x + y + v8_c});
-        (() => x + y);
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.types b/tests/baselines/reference/capturedLetConstInLoop4.types
index 2eb4d11566f45..000da5af1d3ea 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4.types
+++ b/tests/baselines/reference/capturedLetConstInLoop4.types
@@ -26,38 +26,30 @@ export function exportedFoo() {
 >v0 + v00 : string
 >         : ^^^^^^
 >v0 : any
->   : ^^^
 >v00 : string
 >    : ^^^^^^
 >v1 : number
 >   : ^^^^^^
 >v2 : any
->   : ^^^
 >v3 : any
->   : ^^^
 >v4 : number
 >   : ^^^^^^
 >v5 : number
 >   : ^^^^^^
 >v6 : any
->   : ^^^
 >v7 : any
->   : ^^^
 >v8 : number
 >   : ^^^^^^
 }
 
 for (let x of []) {
 >x : any
->  : ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
     var v0 = x;
 >v0 : any
->   : ^^^
 >x : any
->  : ^^^
 
     (function() { return x + v0});
 >(function() { return x + v0}) : () => any
@@ -65,11 +57,8 @@ for (let x of []) {
 >function() { return x + v0} : () => any
 >                            : ^^^^^^^^^
 >x + v0 : any
->       : ^^^
 >x : any
->  : ^^^
 >v0 : any
->   : ^^^
 
     (() => x);    
 >(() => x) : () => any
@@ -77,7 +66,6 @@ for (let x of []) {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
->  : ^^^
 }
 
 for (let x in []) {
@@ -166,13 +154,10 @@ while (1 === 1) {
 
     let x;
 >x : any
->  : ^^^
 
     var v2 = x;
 >v2 : any
->   : ^^^
 >x : any
->  : ^^^
 
     (function() { return x + v2});
 >(function() { return x + v2}) : () => any
@@ -180,11 +165,8 @@ while (1 === 1) {
 >function() { return x + v2} : () => any
 >                            : ^^^^^^^^^
 >x + v2 : any
->       : ^^^
 >x : any
->  : ^^^
 >v2 : any
->   : ^^^
 
     (() => x);
 >(() => x) : () => any
@@ -192,19 +174,15 @@ while (1 === 1) {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
->  : ^^^
 }
 
 do {
     let x;
 >x : any
->  : ^^^
 
     var v3 = x;
 >v3 : any
->   : ^^^
 >x : any
->  : ^^^
 
     (function() { return x + v3});
 >(function() { return x + v3}) : () => any
@@ -212,11 +190,8 @@ do {
 >function() { return x + v3} : () => any
 >                            : ^^^^^^^^^
 >x + v3 : any
->       : ^^^
 >x : any
->  : ^^^
 >v3 : any
->   : ^^^
 
     (() => x);
 >(() => x) : () => any
@@ -224,7 +199,6 @@ do {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
->  : ^^^
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -348,15 +322,11 @@ while (1 === 1) {
 
     let x, y;
 >x : any
->  : ^^^
 >y : any
->  : ^^^
 
     var v6 = x;
 >v6 : any
->   : ^^^
 >x : any
->  : ^^^
 
     (function() { return x + y + v6});
 >(function() { return x + y + v6}) : () => any
@@ -364,15 +334,10 @@ while (1 === 1) {
 >function() { return x + y + v6} : () => any
 >                                : ^^^^^^^^^
 >x + y + v6 : any
->           : ^^^
 >x + y : any
->      : ^^^
 >x : any
->  : ^^^
 >y : any
->  : ^^^
 >v6 : any
->   : ^^^
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -380,25 +345,18 @@ while (1 === 1) {
 >() => x + y : () => any
 >            : ^^^^^^^^^
 >x + y : any
->      : ^^^
 >x : any
->  : ^^^
 >y : any
->  : ^^^
 }
 
 do {
     let x, y;
 >x : any
->  : ^^^
 >y : any
->  : ^^^
 
     var v7 = x;
 >v7 : any
->   : ^^^
 >x : any
->  : ^^^
 
     (function() { return x + y + v7});
 >(function() { return x + y + v7}) : () => any
@@ -406,15 +364,10 @@ do {
 >function() { return x + y + v7} : () => any
 >                                : ^^^^^^^^^
 >x + y + v7 : any
->           : ^^^
 >x + y : any
->      : ^^^
 >x : any
->  : ^^^
 >y : any
->  : ^^^
 >v7 : any
->   : ^^^
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -422,11 +375,8 @@ do {
 >() => x + y : () => any
 >            : ^^^^^^^^^
 >x + y : any
->      : ^^^
 >x : any
->  : ^^^
 >y : any
->  : ^^^
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -518,7 +468,6 @@ export function exportedFoo2() {
 >v0_c + v00_c : string
 >             : ^^^^^^
 >v0_c : any
->     : ^^^
 >v00_c : string
 >      : ^^^^^^
 >v1_c : number
@@ -541,15 +490,12 @@ export function exportedFoo2() {
 
 for (const x of []) {
 >x : any
->  : ^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
     var v0_c = x;
 >v0_c : any
->     : ^^^
 >x : any
->  : ^^^
 
     (function() { return x + v0_c});
 >(function() { return x + v0_c}) : () => any
@@ -557,11 +503,8 @@ for (const x of []) {
 >function() { return x + v0_c} : () => any
 >                              : ^^^^^^^^^
 >x + v0_c : any
->         : ^^^
 >x : any
->  : ^^^
 >v0_c : any
->     : ^^^
 
     (() => x);    
 >(() => x) : () => any
@@ -569,7 +512,6 @@ for (const x of []) {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
->  : ^^^
 }
 
 for (const x in []) {
diff --git a/tests/baselines/reference/chained2.js b/tests/baselines/reference/chained2.js
index 9398f6c6840ff..892f42286a257 100644
--- a/tests/baselines/reference/chained2.js
+++ b/tests/baselines/reference/chained2.js
@@ -34,50 +34,14 @@ var A = /** @class */ (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [c.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = void 0;
-var types = __importStar(require("./b"));
+var types = require("./b");
 exports.default = types;
 //// [d.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var c_1 = __importDefault(require("./c"));
+var c_1 = require("./c");
 new c_1.default.A();
 new c_1.default.B();
 var a = {};
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js
index 4ba0cb44b7a7e..0957401f14420 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js
@@ -30,9 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { c: false };
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js
index 309fb75ad8700..6323827fd2d67 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js
@@ -28,9 +28,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { c: false };
 //// [c.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 b_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js
index a73cf1deae4a4..42e807d7db225 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js
@@ -33,9 +33,6 @@ var bar = { c: 1 };
 exports.default = bar;
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js
index 0934b84307c40..d3cfa97b031ce 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js
@@ -30,9 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { a: 1, b: 1 };
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js
index 592d06b04074d..5fb34e2a5ef8f 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js
@@ -30,9 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { a: 1, b: 1, c: 1 };
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js
index 217c55ad5e904..9c716b4d64813 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js
@@ -33,9 +33,6 @@ var abc = { a: 1, b: 1, c: 1 };
 exports.default = abc;
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 a_1.default;
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
index e6bbf28d39b9d..9a1aeb9222d1f 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
@@ -17,41 +17,8 @@ let d = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a.x} />; /
 
 //// [file.jsx]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var a = <GenericComponent initialValues={{ x: "y" }} nextValues={function (a) { return a; }}/>; // No error
 var b = <GenericComponent initialValues={12} nextValues={function (a) { return a; }}/>; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint)
 var c = <GenericComponent initialValues={{ x: "y" }} nextValues={function (a) { return ({ x: a.x }); }}/>; // No Error
diff --git a/tests/baselines/reference/checkJsxNotSetError.js b/tests/baselines/reference/checkJsxNotSetError.js
index ebc67c9685d71..379f761c084eb 100644
--- a/tests/baselines/reference/checkJsxNotSetError.js
+++ b/tests/baselines/reference/checkJsxNotSetError.js
@@ -17,9 +17,6 @@ var Foo = function () { return (<div>foo</div>); };
 exports.default = Foo;
 //// [bar.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var foo_1 = __importDefault(require("/foo"));
+var foo_1 = require("/foo");
 var a = <foo_1.default />;
diff --git a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
index 199e837626264..2eca8424cd89c 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -43,39 +43,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -114,7 +81,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 var AsyncLoader = /** @class */ (function (_super) {
     __extends(AsyncLoader, _super);
     function AsyncLoader() {
diff --git a/tests/baselines/reference/classStaticBlock24(module=amd).errors.txt b/tests/baselines/reference/classStaticBlock24(module=amd).errors.txt
deleted file mode 100644
index a775df1810045..0000000000000
--- a/tests/baselines/reference/classStaticBlock24(module=amd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== classStaticBlock24.ts (0 errors) ====
-    export class C {
-      static x: number;
-      static {
-        C.x = 1;
-      }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/classStaticBlock24(module=system).errors.txt b/tests/baselines/reference/classStaticBlock24(module=system).errors.txt
deleted file mode 100644
index 6b5f7f745665d..0000000000000
--- a/tests/baselines/reference/classStaticBlock24(module=system).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== classStaticBlock24.ts (0 errors) ====
-    export class C {
-      static x: number;
-      static {
-        C.x = 1;
-      }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/classStaticBlock24(module=umd).errors.txt b/tests/baselines/reference/classStaticBlock24(module=umd).errors.txt
deleted file mode 100644
index b26e6adcd95cf..0000000000000
--- a/tests/baselines/reference/classStaticBlock24(module=umd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== classStaticBlock24.ts (0 errors) ====
-    export class C {
-      static x: number;
-      static {
-        C.x = 1;
-      }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt b/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt
index 8a030e687c10d..14abebcb75fcd 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt
@@ -3,10 +3,10 @@ collisionExportsRequireAndAlias_file2.ts(2,8): error TS2441: Duplicate identifie
 
 
 ==== collisionExportsRequireAndAlias_file2.ts (2 errors) ====
-    import require = require('./collisionExportsRequireAndAlias_file1'); // Error
+    import require = require('collisionExportsRequireAndAlias_file1'); // Error
            ~~~~~~~
 !!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
-    import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error
+    import exports = require('collisionExportsRequireAndAlias_file3333'); // Error
            ~~~~~~~
 !!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
     export function foo() {
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index df3f4a3cb36f0..68c8ae98fb99c 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js
@@ -8,8 +8,8 @@ export function bar() {
 export function bar2() {
 }
 //// [collisionExportsRequireAndAlias_file2.ts]
-import require = require('./collisionExportsRequireAndAlias_file1'); // Error
-import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error
+import require = require('collisionExportsRequireAndAlias_file1'); // Error
+import exports = require('collisionExportsRequireAndAlias_file3333'); // Error
 export function foo() {
     require.bar();
 }
@@ -18,27 +18,31 @@ export function foo2() {
 }
 
 //// [collisionExportsRequireAndAlias_file1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bar = bar;
-function bar() {
-}
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.bar = bar;
+    function bar() {
+    }
+});
 //// [collisionExportsRequireAndAlias_file3333.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bar2 = bar2;
-function bar2() {
-}
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.bar2 = bar2;
+    function bar2() {
+    }
+});
 //// [collisionExportsRequireAndAlias_file2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.foo = foo;
-exports.foo2 = foo2;
-var require = require("./collisionExportsRequireAndAlias_file1"); // Error
-var exports = require("./collisionExportsRequireAndAlias_file3333"); // Error
-function foo() {
-    require.bar();
-}
-function foo2() {
-    exports.bar2();
-}
+define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.foo = foo;
+    exports.foo2 = foo2;
+    function foo() {
+        require.bar();
+    }
+    function foo2() {
+        exports.bar2();
+    }
+});
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.symbols b/tests/baselines/reference/collisionExportsRequireAndAlias.symbols
index 471d8d7742dd7..8b85320e2c981 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.symbols
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.symbols
@@ -1,14 +1,14 @@
 //// [tests/cases/compiler/collisionExportsRequireAndAlias.ts] ////
 
 === collisionExportsRequireAndAlias_file2.ts ===
-import require = require('./collisionExportsRequireAndAlias_file1'); // Error
+import require = require('collisionExportsRequireAndAlias_file1'); // Error
 >require : Symbol(require, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 0))
 
-import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error
->exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 68))
+import exports = require('collisionExportsRequireAndAlias_file3333'); // Error
+>exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 66))
 
 export function foo() {
->foo : Symbol(foo, Decl(collisionExportsRequireAndAlias_file2.ts, 1, 71))
+>foo : Symbol(foo, Decl(collisionExportsRequireAndAlias_file2.ts, 1, 69))
 
     require.bar();
 >require.bar : Symbol(require.bar, Decl(collisionExportsRequireAndAlias_file1.ts, 0, 0))
@@ -20,7 +20,7 @@ export function foo2() {
 
     exports.bar2();
 >exports.bar2 : Symbol(exports.bar2, Decl(collisionExportsRequireAndAlias_file3333.ts, 0, 0))
->exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 68))
+>exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 66))
 >bar2 : Symbol(exports.bar2, Decl(collisionExportsRequireAndAlias_file3333.ts, 0, 0))
 }
 === collisionExportsRequireAndAlias_file1.ts ===
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.types b/tests/baselines/reference/collisionExportsRequireAndAlias.types
index 39d242dc75f75..fae7e43435e2d 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.types
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/collisionExportsRequireAndAlias.ts] ////
 
 === collisionExportsRequireAndAlias_file2.ts ===
-import require = require('./collisionExportsRequireAndAlias_file1'); // Error
+import require = require('collisionExportsRequireAndAlias_file1'); // Error
 >require : typeof require
 >        : ^^^^^^^^^^^^^^
 
-import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error
+import exports = require('collisionExportsRequireAndAlias_file3333'); // Error
 >exports : typeof exports
 >        : ^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
index 0cb05d30de00f..2a83fcf37857e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
@@ -38,11 +38,13 @@ namespace m4 {
 }
 
 //// [collisionExportsRequireAndAmbientClass_externalmodule.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var m2;
-(function (m2) {
-})(m2 || (m2 = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var m2;
+    (function (m2) {
+    })(m2 || (m2 = {}));
+});
 //// [collisionExportsRequireAndAmbientClass_globalFile.js]
 var m4;
 (function (m4) {
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
index b079a99993eae..8a28a23366296 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
@@ -61,11 +61,13 @@ namespace m4 {
 }
 
 //// [collisionExportsRequireAndAmbientEnum_externalmodule.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var m2;
-(function (m2) {
-})(m2 || (m2 = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var m2;
+    (function (m2) {
+    })(m2 || (m2 = {}));
+});
 //// [collisionExportsRequireAndAmbientEnum_globalFile.js]
 var m4;
 (function (m4) {
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
index adacc64d19b9e..b8e48cae79845 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
@@ -16,9 +16,11 @@ namespace m2 {
 }
 
 //// [collisionExportsRequireAndAmbientFunction.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var m2;
-(function (m2) {
-    var a = 10;
-})(m2 || (m2 = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var m2;
+    (function (m2) {
+        var a = 10;
+    })(m2 || (m2 = {}));
+});
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index ef3e16eeca09a..3680fe8caf028 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
@@ -95,20 +95,22 @@ namespace m4 {
 
 
 //// [collisionExportsRequireAndAmbientModule_externalmodule.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.foo = foo;
-exports.foo2 = foo2;
-function foo() {
-    return null;
-}
-function foo2() {
-    return null;
-}
-var m2;
-(function (m2) {
-    var a = 10;
-})(m2 || (m2 = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.foo = foo;
+    exports.foo2 = foo2;
+    function foo() {
+        return null;
+    }
+    function foo2() {
+        return null;
+    }
+    var m2;
+    (function (m2) {
+        var a = 10;
+    })(m2 || (m2 = {}));
+});
 //// [collisionExportsRequireAndAmbientModule_globalFile.js]
 var m4;
 (function (m4) {
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
index 273cee0d2e37e..cd31c9d2a3547 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
@@ -27,12 +27,14 @@ namespace m4 {
 }
 
 //// [collisionExportsRequireAndAmbientVar_externalmodule.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var m2;
-(function (m2) {
-    var a = 10;
-})(m2 || (m2 = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var m2;
+    (function (m2) {
+        var a = 10;
+    })(m2 || (m2 = {}));
+});
 //// [collisionExportsRequireAndAmbientVar_globalFile.js]
 var m4;
 (function (m4) {
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
index 4166e3d8a6835..a2635142096ff 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 collisionExportsRequireAndClass_externalmodule.ts(1,14): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 collisionExportsRequireAndClass_externalmodule.ts(3,14): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== collisionExportsRequireAndClass_externalmodule.ts (2 errors) ====
     export class require {
                  ~~~~~~~
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
index 26bcf5ab58f4f..c929a282c8d49 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 collisionExportsRequireAndEnum_externalmodule.ts(1,13): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== collisionExportsRequireAndEnum_externalmodule.ts (2 errors) ====
     export enum require { // Error
                 ~~~~~~~
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
index f1131515da2e0..414dfe834f90f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 collisionExportsRequireAndFunction.ts(1,17): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
 collisionExportsRequireAndFunction.ts(4,17): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== collisionExportsRequireAndFunction.ts (2 errors) ====
     export function exports() {
                     ~~~~~~~
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
index c46911ce9f906..6eb1079637611 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 collisionExportsRequireAndInternalModuleAlias.ts(5,8): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
 collisionExportsRequireAndInternalModuleAlias.ts(6,8): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== collisionExportsRequireAndInternalModuleAlias.ts (2 errors) ====
     export namespace m {
         export class c {
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
index 4047235cb1366..8f0bad198b7f1 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 collisionExportsRequireAndModule_externalmodule.ts(1,18): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 collisionExportsRequireAndModule_externalmodule.ts(10,18): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== collisionExportsRequireAndModule_externalmodule.ts (2 errors) ====
     export namespace require {
                      ~~~~~~~
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
deleted file mode 100644
index b74aa3662bb84..0000000000000
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== collisionExportsRequireAndUninstantiatedModule.ts (0 errors) ====
-    export namespace require { // no error 
-        export interface I {
-        }
-    }
-    export function foo(): require.I {
-        return null;
-    }
-    export namespace exports { // no error
-        export interface I {
-        }
-    }
-    export function foo2(): exports.I {
-        return null;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
index 71df615719c91..5d6c84e914cdd 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 collisionExportsRequireAndVar_externalmodule.ts(3,5): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
 collisionExportsRequireAndVar_externalmodule.ts(4,5): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== collisionExportsRequireAndVar_externalmodule.ts (2 errors) ====
     export function foo() {
     }
diff --git a/tests/baselines/reference/commentOnImportStatement1.errors.txt b/tests/baselines/reference/commentOnImportStatement1.errors.txt
index 4e5cb3b10c562..752db3d4fecc1 100644
--- a/tests/baselines/reference/commentOnImportStatement1.errors.txt
+++ b/tests/baselines/reference/commentOnImportStatement1.errors.txt
@@ -1,4 +1,4 @@
-commentOnImportStatement1.ts(3,22): error TS2307: Cannot find module './foo' or its corresponding type declarations.
+commentOnImportStatement1.ts(3,22): error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== commentOnImportStatement1.ts (1 errors) ====
@@ -6,5 +6,5 @@ commentOnImportStatement1.ts(3,22): error TS2307: Cannot find module './foo' or
     
     import foo = require('./foo');
                          ~~~~~~~
-!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
\ No newline at end of file
diff --git a/tests/baselines/reference/commentOnImportStatement1.js b/tests/baselines/reference/commentOnImportStatement1.js
index 93eb14b9a45b2..3ff36c187a46c 100644
--- a/tests/baselines/reference/commentOnImportStatement1.js
+++ b/tests/baselines/reference/commentOnImportStatement1.js
@@ -7,6 +7,8 @@ import foo = require('./foo');
 
 
 //// [commentOnImportStatement1.js]
-"use strict";
 /* Copyright */
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt b/tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt
deleted file mode 100644
index 39265bd0f71fa..0000000000000
--- a/tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsBeforeVariableStatement1.ts (0 errors) ====
-    /** b's comment*/
-    export var b: number;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsDottedModuleName.errors.txt b/tests/baselines/reference/commentsDottedModuleName.errors.txt
deleted file mode 100644
index 4893cf17c42f3..0000000000000
--- a/tests/baselines/reference/commentsDottedModuleName.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsDottedModuleName.ts (0 errors) ====
-    /** this is multi declare module*/
-    export namespace outerModule.InnerModule {
-        /// class b comment
-        export class b {
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsExternalModules.errors.txt b/tests/baselines/reference/commentsExternalModules.errors.txt
deleted file mode 100644
index 1e2d583d84131..0000000000000
--- a/tests/baselines/reference/commentsExternalModules.errors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsExternalModules_1.ts (0 errors) ====
-    /**This is on import declaration*/
-    import extMod = require("commentsExternalModules_0"); // trailing comment1
-    extMod.m1.fooExport();
-    var newVar = new extMod.m1.m2.c();
-    extMod.m4.fooExport();
-    var newVar2 = new extMod.m4.m2.c();
-    
-==== commentsExternalModules_0.ts (0 errors) ====
-    /** Module comment*/
-    export namespace m1 {
-        /** b's comment*/
-        export var b: number;
-        /** foo's comment*/
-        function foo() {
-            return b;
-        }
-        /** m2 comments*/
-        export namespace m2 {
-            /** class comment;*/
-            export class c {
-            };
-            /** i*/
-            export var i = new c();
-        }
-        /** exported function*/
-        export function fooExport() {
-            return foo();
-        }
-    }
-    m1.fooExport();
-    var myvar = new m1.m2.c();
-    
-    /** Module comment */
-    export namespace m4 {
-        /** b's comment */
-        export var b: number;
-        /** foo's comment
-        */
-        function foo() {
-            return b;
-        }
-        /** m2 comments
-        */
-        export namespace m2 {
-            /** class comment; */
-            export class c {
-            };
-            /** i */
-            export var i = new c();
-        }
-        /** exported function */
-        export function fooExport() {
-            return foo();
-        }
-    }
-    m4.fooExport();
-    var myvar2 = new m4.m2.c();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsExternalModules2.errors.txt b/tests/baselines/reference/commentsExternalModules2.errors.txt
deleted file mode 100644
index 859f2c1134ec3..0000000000000
--- a/tests/baselines/reference/commentsExternalModules2.errors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsExternalModules_1.ts (0 errors) ====
-    /**This is on import declaration*/
-    import extMod = require("commentsExternalModules2_0"); // trailing comment 1
-    extMod.m1.fooExport();
-    export var newVar = new extMod.m1.m2.c();
-    extMod.m4.fooExport();
-    export var newVar2 = new extMod.m4.m2.c();
-    
-==== commentsExternalModules2_0.ts (0 errors) ====
-    /** Module comment*/
-    export namespace m1 {
-        /** b's comment*/
-        export var b: number;
-        /** foo's comment*/
-        function foo() {
-            return b;
-        }
-        /** m2 comments*/
-        export namespace m2 {
-            /** class comment;*/
-            export class c {
-            };
-            /** i*/
-            export var i = new c();
-        }
-        /** exported function*/
-        export function fooExport() {
-            return foo();
-        }
-    }
-    m1.fooExport();
-    var myvar = new m1.m2.c();
-    
-    /** Module comment */
-    export namespace m4 {
-        /** b's comment */
-        export var b: number;
-        /** foo's comment
-        */
-        function foo() {
-            return b;
-        }
-        /** m2 comments
-        */
-        export namespace m2 {
-            /** class comment; */
-            export class c {
-            };
-            /** i */
-            export var i = new c();
-        }
-        /** exported function */
-        export function fooExport() {
-            return foo();
-        }
-    }
-    m4.fooExport();
-    var myvar2 = new m4.m2.c();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
deleted file mode 100644
index 7bba5d1ad20e3..0000000000000
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsMultiModuleMultiFile_1.ts (0 errors) ====
-    import m = require('commentsMultiModuleMultiFile_0');
-    /** this is multi module 3 comment*/
-    export namespace multiM {
-        /** class d comment*/
-        export class d {
-        }
-    
-        /// class f comment
-        export class f {
-        }
-    }
-    new multiM.d();
-==== commentsMultiModuleMultiFile_0.ts (0 errors) ====
-    /** this is multi declare module*/
-    export namespace multiM {
-        /// class b comment
-        export class b {
-        }
-    }
-    /** thi is multi module 2*/
-    export namespace multiM {
-        /** class c comment*/
-        export class c {
-        }
-    
-        // class e comment
-        export class e {
-        }
-    }
-    
-    new multiM.b();
-    new multiM.c();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).errors.txt
deleted file mode 100644
index 0ab9bcb53b3e2..0000000000000
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsOnJSXExpressionsArePreserved.tsx (0 errors) ====
-    // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
-    namespace JSX {}
-    class Component {
-        render() {
-            return <div>
-                {/* missing */}
-                {null/* preserved */}
-                {
-                    // ??? 1
-                }
-                { // ??? 2
-                }
-                {// ??? 3
-                }
-                {
-                    // ??? 4
-                /* ??? 5 */}
-            </div>;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).types b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).types
index f4ceb70601f1e..bdb53395ee523 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).types
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).types
@@ -12,8 +12,7 @@ class Component {
 >       : ^^^^^^^^^
 
         return <div>
-><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : any
->                                                                                                                                                                                                                                                                    : ^^^
+><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : error
 >div : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).errors.txt
deleted file mode 100644
index 0ab9bcb53b3e2..0000000000000
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsOnJSXExpressionsArePreserved.tsx (0 errors) ====
-    // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
-    namespace JSX {}
-    class Component {
-        render() {
-            return <div>
-                {/* missing */}
-                {null/* preserved */}
-                {
-                    // ??? 1
-                }
-                { // ??? 2
-                }
-                {// ??? 3
-                }
-                {
-                    // ??? 4
-                /* ??? 5 */}
-            </div>;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).types b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).types
index f4ceb70601f1e..bdb53395ee523 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).types
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).types
@@ -12,8 +12,7 @@ class Component {
 >       : ^^^^^^^^^
 
         return <div>
-><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : any
->                                                                                                                                                                                                                                                                    : ^^^
+><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : error
 >div : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).errors.txt
deleted file mode 100644
index 0ab9bcb53b3e2..0000000000000
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== commentsOnJSXExpressionsArePreserved.tsx (0 errors) ====
-    // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
-    namespace JSX {}
-    class Component {
-        render() {
-            return <div>
-                {/* missing */}
-                {null/* preserved */}
-                {
-                    // ??? 1
-                }
-                { // ??? 2
-                }
-                {// ??? 3
-                }
-                {
-                    // ??? 4
-                /* ??? 5 */}
-            </div>;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).types b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).types
index f4ceb70601f1e..bdb53395ee523 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).types
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).types
@@ -12,8 +12,7 @@ class Component {
 >       : ^^^^^^^^^
 
         return <div>
-><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : any
->                                                                                                                                                                                                                                                                    : ^^^
+><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : error
 >div : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=auto).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=auto).errors.txt
index b338d2b06acca..b0f02293888ef 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=auto).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=auto).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,17): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=force).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=force).errors.txt
index b338d2b06acca..b0f02293888ef 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=force).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=force).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,17): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=legacy).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=legacy).errors.txt
index b338d2b06acca..b0f02293888ef 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=legacy).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react,module=system,moduledetection=legacy).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,17): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=auto).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=auto).errors.txt
index df6ef89966412..14edadd8849fa 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=auto).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=auto).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,16): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=force).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=force).errors.txt
index df6ef89966412..14edadd8849fa 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=force).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=force).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,16): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=legacy).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=legacy).errors.txt
index df6ef89966412..14edadd8849fa 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=legacy).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=system,moduledetection=legacy).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,16): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=auto).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=auto).errors.txt
index d87ec056015c4..c7df0dceaad77 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=auto).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=auto).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,16): error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=force).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=force).errors.txt
index d87ec056015c4..c7df0dceaad77 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=force).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=force).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,16): error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=legacy).errors.txt b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=legacy).errors.txt
index d87ec056015c4..c7df0dceaad77 100644
--- a/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=legacy).errors.txt
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=system,moduledetection=legacy).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 commentsOnJSXExpressionsArePreserved.tsx(5,16): error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== commentsOnJSXExpressionsArePreserved.tsx (1 errors) ====
     // file is intentionally not a module - this tests for a crash in the module/system transforms alongside the `react-jsx` and `react-jsxdev` outputs
     namespace JSX {}
diff --git a/tests/baselines/reference/commonSourceDir5.errors.txt b/tests/baselines/reference/commonSourceDir5.errors.txt
index 33dc2ec159f5f..f7ee068ce8474 100644
--- a/tests/baselines/reference/commonSourceDir5.errors.txt
+++ b/tests/baselines/reference/commonSourceDir5.errors.txt
@@ -1,7 +1,7 @@
-error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
 
 
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
+!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
 ==== A:/bar.ts (0 errors) ====
     import {z} from "./foo";
     export var x = z + z;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
new file mode 100644
index 0000000000000..17e144e76e5d2
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir5.js
@@ -0,0 +1,38 @@
+//// [tests/cases/compiler/commonSourceDir5.ts] ////
+
+//// [bar.ts]
+import {z} from "./foo";
+export var x = z + z;
+
+//// [foo.ts]
+import {pi} from "B:/baz";
+export var i = Math.sqrt(-1);
+export var z = pi * pi;
+
+//// [baz.ts]
+import {x} from "A:/bar";
+import {i} from "A:/foo";
+export var pi = Math.PI;
+export var y = x * i;
+
+//// [concat.js]
+define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.y = exports.pi = void 0;
+    exports.pi = Math.PI;
+    exports.y = bar_1.x * foo_1.i;
+});
+define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.z = exports.i = void 0;
+    exports.i = Math.sqrt(-1);
+    exports.z = baz_1.pi * baz_1.pi;
+});
+define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = foo_2.z + foo_2.z;
+});
diff --git a/tests/baselines/reference/commonSourceDir6.errors.txt b/tests/baselines/reference/commonSourceDir6.errors.txt
deleted file mode 100644
index fe46c907271ff..0000000000000
--- a/tests/baselines/reference/commonSourceDir6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a/bar.ts (0 errors) ====
-    import {z} from "./foo";
-    export var x = z + z;
-    
-==== a/foo.ts (0 errors) ====
-    import {pi} from "../baz";
-    export var i = Math.sqrt(-1);
-    export var z = pi * pi;
-    
-==== baz.ts (0 errors) ====
-    import {x} from "a/bar";
-    import {i} from "a/foo";
-    export var pi = Math.PI;
-    export var y = x * i;
\ No newline at end of file
diff --git a/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --module.js b/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --module.js
index 55a526b03dce5..69a03af11011b 100644
--- a/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --module.js	
+++ b/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --module.js	
@@ -7,4 +7,4 @@ FileNames::
 0.ts
 Errors::
 error TS6044: Compiler option 'module' expects an argument.
-error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
diff --git a/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --moduleResolution.js b/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --moduleResolution.js
index d9f02017608e8..d4a79bbd281e8 100644
--- a/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --moduleResolution.js	
+++ b/tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --moduleResolution.js	
@@ -7,4 +7,4 @@ FileNames::
 0.ts
 Errors::
 error TS6044: Compiler option 'moduleResolution' expects an argument.
-error TS6046: Argument for '--moduleResolution' option must be: 'node16', 'nodenext', 'bundler'.
+error TS6046: Argument for '--moduleResolution' option must be: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.
diff --git a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with json api.js b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with json api.js
index 95145439db753..469feff50a44e 100644
--- a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with json api.js	
+++ b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with json api.js	
@@ -25,5 +25,5 @@ CompilerOptions::
   "configFilePath": "/apath/tsconfig.json"
 }
 Errors::
-error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 
diff --git a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with jsonSourceFile api.js b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with jsonSourceFile api.js
index f2c89c02144f3..319a40dc19c17 100644
--- a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with jsonSourceFile api.js	
+++ b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with jsonSourceFile api.js	
@@ -25,7 +25,7 @@ CompilerOptions::
   "configFilePath": "/apath/tsconfig.json"
 }
 Errors::
-tsconfig.json:3:15 - error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+tsconfig.json:3:15 - error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 
 3     "module": "",
                 ~~
diff --git a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with json api.js b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with json api.js
index 9a1269d4e9957..3ca29cf41cf23 100644
--- a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with json api.js	
+++ b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with json api.js	
@@ -23,5 +23,5 @@ CompilerOptions::
   "configFilePath": "/apath/tsconfig.json"
 }
 Errors::
-error TS6046: Argument for '--moduleResolution' option must be: 'node16', 'nodenext', 'bundler'.
+error TS6046: Argument for '--moduleResolution' option must be: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.
 
diff --git a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with jsonSourceFile api.js b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with jsonSourceFile api.js
index b947f732dd46c..e180d422e0f3e 100644
--- a/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with jsonSourceFile api.js	
+++ b/tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module-resolution to compiler-options with jsonSourceFile api.js	
@@ -23,7 +23,7 @@ CompilerOptions::
   "configFilePath": "/apath/tsconfig.json"
 }
 Errors::
-tsconfig.json:3:25 - error TS6046: Argument for '--moduleResolution' option must be: 'node16', 'nodenext', 'bundler'.
+tsconfig.json:3:25 - error TS6046: Argument for '--moduleResolution' option must be: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.
 
 3     "moduleResolution": "",
                           ~~
diff --git a/tests/baselines/reference/config/showConfig/Show TSConfig with transitively implied options/tsconfig.json b/tests/baselines/reference/config/showConfig/Show TSConfig with transitively implied options/tsconfig.json
index 0c16b16a784bb..774b13aa29a76 100644
--- a/tests/baselines/reference/config/showConfig/Show TSConfig with transitively implied options/tsconfig.json	
+++ b/tests/baselines/reference/config/showConfig/Show TSConfig with transitively implied options/tsconfig.json	
@@ -4,6 +4,7 @@
         "target": "esnext",
         "moduleResolution": "nodenext",
         "moduleDetection": "force",
+        "esModuleInterop": true,
         "useDefineForClassFields": true
     }
 }
diff --git a/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/module/tsconfig.json b/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/module/tsconfig.json
index 76640f8c61e97..8aa589286d383 100644
--- a/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/module/tsconfig.json	
+++ b/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/module/tsconfig.json	
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "module": "none",
         "moduleResolution": "classic",
+        "allowSyntheticDefaultImports": false,
         "resolvePackageJsonExports": false,
         "resolvePackageJsonImports": false,
         "resolveJsonModule": false
diff --git a/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/moduleResolution/tsconfig.json b/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/moduleResolution/tsconfig.json
index dc2bf56f82562..84e7539a3910a 100644
--- a/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/moduleResolution/tsconfig.json	
+++ b/tests/baselines/reference/config/showConfig/Shows tsconfig for single option/moduleResolution/tsconfig.json	
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "moduleResolution": "node10",
+        "allowSyntheticDefaultImports": false,
         "resolvePackageJsonExports": false,
         "resolvePackageJsonImports": false,
         "resolveJsonModule": false
diff --git a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace1.js b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace1.js
index afe1496a3c49a..31a0e0006b9d2 100644
--- a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace1.js
+++ b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace1.js
@@ -31,41 +31,8 @@ export const pick = () => pick();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pick = void 0;
-var pick = __importStar(require("lodash/pick"));
+var pick = require("lodash/pick");
 var pick = function () { return (0, exports.pick)(); };
 exports.pick = pick;
diff --git a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js
index 5599c53c35971..d3bf6101e17cd 100644
--- a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js
+++ b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js
@@ -31,41 +31,8 @@ export const pick = () => pick();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pick = void 0;
-var pick = __importStar(require("lodash/pick"));
+var pick = require("lodash/pick");
 var pick = function () { return (0, exports.pick)(); };
 exports.pick = pick;
diff --git a/tests/baselines/reference/constDeclarations-access5.errors.txt b/tests/baselines/reference/constDeclarations-access5.errors.txt
index b4cdcc1481ac3..d1751cdb12dd3 100644
--- a/tests/baselines/reference/constDeclarations-access5.errors.txt
+++ b/tests/baselines/reference/constDeclarations-access5.errors.txt
@@ -20,7 +20,7 @@ constDeclarations_access_2.ts(24,3): error TS2540: Cannot assign to 'x' because
 
 ==== constDeclarations_access_2.ts (18 errors) ====
     ///<reference path='constDeclarations_access_1.ts'/>
-    import m = require('./constDeclarations_access_1');
+    import m = require('constDeclarations_access_1');
     // Errors
     m.x = 1;
       ~
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 4e5ca86aadede..9f56b8c37eb28 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -5,7 +5,7 @@ export const x = 0;
 
 //// [constDeclarations_access_2.ts]
 ///<reference path='constDeclarations_access_1.ts'/>
-import m = require('./constDeclarations_access_1');
+import m = require('constDeclarations_access_1');
 // Errors
 m.x = 1;
 m.x += 2;
@@ -47,42 +47,44 @@ m.x.toString();
 
 
 //// [constDeclarations_access_1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.x = void 0;
-exports.x = 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = 0;
+});
 //// [constDeclarations_access_2.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-///<reference path='constDeclarations_access_1.ts'/>
-const m = require("./constDeclarations_access_1");
-// Errors
-m.x = 1;
-m.x += 2;
-m.x -= 3;
-m.x *= 4;
-m.x /= 5;
-m.x %= 6;
-m.x <<= 7;
-m.x >>= 8;
-m.x >>>= 9;
-m.x &= 10;
-m.x |= 11;
-m.x ^= 12;
-m;
-m.x++;
-m.x--;
-++m.x;
---m.x;
-++((m.x));
-m["x"] = 0;
-// OK
-var a = m.x + 1;
-function f(v) { }
-f(m.x);
-if (m.x) { }
-m.x;
-(m.x);
--m.x;
-+m.x;
-m.x.toString();
+define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // Errors
+    m.x = 1;
+    m.x += 2;
+    m.x -= 3;
+    m.x *= 4;
+    m.x /= 5;
+    m.x %= 6;
+    m.x <<= 7;
+    m.x >>= 8;
+    m.x >>>= 9;
+    m.x &= 10;
+    m.x |= 11;
+    m.x ^= 12;
+    m;
+    m.x++;
+    m.x--;
+    ++m.x;
+    --m.x;
+    ++((m.x));
+    m["x"] = 0;
+    // OK
+    var a = m.x + 1;
+    function f(v) { }
+    f(m.x);
+    if (m.x) { }
+    m.x;
+    (m.x);
+    -m.x;
+    +m.x;
+    m.x.toString();
+});
diff --git a/tests/baselines/reference/constDeclarations-access5.symbols b/tests/baselines/reference/constDeclarations-access5.symbols
index 59d9f3ed8cb7a..65623de9f6023 100644
--- a/tests/baselines/reference/constDeclarations-access5.symbols
+++ b/tests/baselines/reference/constDeclarations-access5.symbols
@@ -2,7 +2,7 @@
 
 === constDeclarations_access_2.ts ===
 ///<reference path='constDeclarations_access_1.ts'/>
-import m = require('./constDeclarations_access_1');
+import m = require('constDeclarations_access_1');
 >m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0))
 
 // Errors
diff --git a/tests/baselines/reference/constDeclarations-access5.types b/tests/baselines/reference/constDeclarations-access5.types
index bbc39860b8a02..54ad90a7a7f49 100644
--- a/tests/baselines/reference/constDeclarations-access5.types
+++ b/tests/baselines/reference/constDeclarations-access5.types
@@ -2,7 +2,7 @@
 
 === constDeclarations_access_2.ts ===
 ///<reference path='constDeclarations_access_1.ts'/>
-import m = require('./constDeclarations_access_1');
+import m = require('constDeclarations_access_1');
 >m : typeof m
 >  : ^^^^^^^^
 
diff --git a/tests/baselines/reference/constEnumExternalModule.errors.txt b/tests/baselines/reference/constEnumExternalModule.errors.txt
deleted file mode 100644
index d08f6cfde81f6..0000000000000
--- a/tests/baselines/reference/constEnumExternalModule.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m2.ts (0 errors) ====
-    import A = require('m1')
-    var v = A.V;
-==== m1.ts (0 errors) ====
-    const enum E {
-        V = 100
-    }
-    
-    export = E
\ No newline at end of file
diff --git a/tests/baselines/reference/constEnumMergingWithValues1.errors.txt b/tests/baselines/reference/constEnumMergingWithValues1.errors.txt
deleted file mode 100644
index 89a9781a77439..0000000000000
--- a/tests/baselines/reference/constEnumMergingWithValues1.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    function foo() {}
-    namespace foo {
-        const enum E { X }
-    }
-    
-    export = foo
\ No newline at end of file
diff --git a/tests/baselines/reference/constEnumMergingWithValues2.errors.txt b/tests/baselines/reference/constEnumMergingWithValues2.errors.txt
deleted file mode 100644
index 41c37c230e61a..0000000000000
--- a/tests/baselines/reference/constEnumMergingWithValues2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    class foo {}
-    namespace foo {
-        const enum E { X }
-    }
-    
-    export = foo
\ No newline at end of file
diff --git a/tests/baselines/reference/constEnumMergingWithValues3.errors.txt b/tests/baselines/reference/constEnumMergingWithValues3.errors.txt
deleted file mode 100644
index 392e81fe5db77..0000000000000
--- a/tests/baselines/reference/constEnumMergingWithValues3.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    enum foo { A }
-    namespace foo {
-        const enum E { X }
-    }
-    
-    export = foo
\ No newline at end of file
diff --git a/tests/baselines/reference/constEnumMergingWithValues4.errors.txt b/tests/baselines/reference/constEnumMergingWithValues4.errors.txt
deleted file mode 100644
index e46dea07f4330..0000000000000
--- a/tests/baselines/reference/constEnumMergingWithValues4.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    namespace foo {
-        const enum E { X }
-    }
-    
-    namespace foo {
-        var x = 1;
-    }
-    
-    
-    export = foo
\ No newline at end of file
diff --git a/tests/baselines/reference/constEnumMergingWithValues5.errors.txt b/tests/baselines/reference/constEnumMergingWithValues5.errors.txt
deleted file mode 100644
index 2fa0a85fe0dbd..0000000000000
--- a/tests/baselines/reference/constEnumMergingWithValues5.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    namespace foo {
-        const enum E { X }
-    }
-    
-    export = foo
\ No newline at end of file
diff --git a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js
index 7fd7a2c89d718..cdec1c13c760a 100644
--- a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js
+++ b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js
@@ -32,41 +32,8 @@ var ConstFooEnum;
 function fooFunc() { }
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var Foo = __importStar(require("./foo"));
+var Foo = require("./foo");
 function check(x) {
     switch (x) {
         case Foo.ConstFooEnum.Some:
diff --git a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js
index 061ccc6c9f18b..518f0c19e6adc 100644
--- a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js
+++ b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js
@@ -37,40 +37,7 @@ var ConstEnumOnlyModule;
 })(ConstEnumOnlyModule || (exports.ConstEnumOnlyModule = ConstEnumOnlyModule = {}));
 //// [reexport.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var Foo = __importStar(require("./foo"));
+var Foo = require("./foo");
 module.exports = Foo.ConstEnumOnlyModule;
 //// [index.js]
 "use strict";
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
index aa9bfba6e21b7..fe35e91819fa6 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
@@ -40,24 +40,25 @@ const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" |
 
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MainButton = MainButton;
-exports.NoOverload = NoOverload;
-exports.NoOverload1 = NoOverload1;
-var React = require("react");
-function MainButton(props) {
-    var linkProps = props;
-    if (linkProps.goTo) {
-        return this._buildMainLink(props);
+define(["require", "exports", "react"], function (require, exports, React) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MainButton = MainButton;
+    exports.NoOverload = NoOverload;
+    exports.NoOverload1 = NoOverload1;
+    function MainButton(props) {
+        var linkProps = props;
+        if (linkProps.goTo) {
+            return this._buildMainLink(props);
+        }
+        return this._buildMainButton(props);
     }
-    return this._buildMainButton(props);
-}
-var b0 = <MainButton {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type "left" | "right"
-var b2 = <MainButton onClick={function (k) { console.log(k); }} extra/>; // k has type "left" | "right"
-var b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
-var b4 = <MainButton goTo="home" extra/>; // goTo has type "home" | "contact"
-function NoOverload(buttonProps) { return undefined; }
-var c1 = <NoOverload {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type any
-function NoOverload1(linkProps) { return undefined; }
-var d1 = <NoOverload1 {...{ goTo: "home" }} extra/>; // goTo has type "home" | "contact"
+    var b0 = <MainButton {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type "left" | "right"
+    var b2 = <MainButton onClick={function (k) { console.log(k); }} extra/>; // k has type "left" | "right"
+    var b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
+    var b4 = <MainButton goTo="home" extra/>; // goTo has type "home" | "contact"
+    function NoOverload(buttonProps) { return undefined; }
+    var c1 = <NoOverload {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type any
+    function NoOverload1(linkProps) { return undefined; }
+    var d1 = <NoOverload1 {...{ goTo: "home" }} extra/>; // goTo has type "home" | "contact"
+});
diff --git a/tests/baselines/reference/copyrightWithNewLine1.errors.txt b/tests/baselines/reference/copyrightWithNewLine1.errors.txt
index c091aec88b66d..1f1e7b1fb1c73 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.errors.txt
+++ b/tests/baselines/reference/copyrightWithNewLine1.errors.txt
@@ -1,4 +1,4 @@
-copyrightWithNewLine1.ts(5,24): error TS2307: Cannot find module './greeter' or its corresponding type declarations.
+copyrightWithNewLine1.ts(5,24): error TS2792: Cannot find module './greeter'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== copyrightWithNewLine1.ts (1 errors) ====
@@ -8,7 +8,7 @@ copyrightWithNewLine1.ts(5,24): error TS2307: Cannot find module './greeter' or
     
     import model = require("./greeter")
                            ~~~~~~~~~~~
-!!! error TS2307: Cannot find module './greeter' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './greeter'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js
index a3c8ab6817a86..0681fec54f7cd 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -12,13 +12,14 @@ var greeter = new model.Greeter(el);
 greeter.start();
 
 //// [copyrightWithNewLine1.js]
-"use strict";
 /*****************************
 * (c) Copyright - Important
 ****************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-var model = require("./greeter");
-var el = document.getElementById('content');
-var greeter = new model.Greeter(el);
-/** things */
-greeter.start();
+define(["require", "exports", "./greeter"], function (require, exports, model) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var el = document.getElementById('content');
+    var greeter = new model.Greeter(el);
+    /** things */
+    greeter.start();
+});
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt b/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
index cc9d2adb142ed..792459828a902 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
@@ -1,4 +1,4 @@
-copyrightWithoutNewLine1.ts(4,24): error TS2307: Cannot find module './greeter' or its corresponding type declarations.
+copyrightWithoutNewLine1.ts(4,24): error TS2792: Cannot find module './greeter'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== copyrightWithoutNewLine1.ts (1 errors) ====
@@ -7,7 +7,7 @@ copyrightWithoutNewLine1.ts(4,24): error TS2307: Cannot find module './greeter'
     ****************************/
     import model = require("./greeter")
                            ~~~~~~~~~~~
-!!! error TS2307: Cannot find module './greeter' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './greeter'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js
index f4cc84e33551e..c7c6e137a6e95 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -11,13 +11,11 @@ var greeter = new model.Greeter(el);
 greeter.start();
 
 //// [copyrightWithoutNewLine1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/*****************************
-* (c) Copyright - Important
-****************************/
-var model = require("./greeter");
-var el = document.getElementById('content');
-var greeter = new model.Greeter(el);
-/** things */
-greeter.start();
+define(["require", "exports", "./greeter"], function (require, exports, model) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var el = document.getElementById('content');
+    var greeter = new model.Greeter(el);
+    /** things */
+    greeter.start();
+});
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 45aead7e95f15..aa8f536c1ec13 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,11 +15,16 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 
 
 //// [crashIntypeCheckInvocationExpression.js]
-var nake;
-function doCompile(fileset, moduleType) {
-    return undefined;
-}
-export var compileServer = task(function () {
-    var folder = path.join(), fileset = nake.fileSetSync(folder);
-    return doCompile(fileset, moduleType);
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.compileServer = void 0;
+    var nake;
+    function doCompile(fileset, moduleType) {
+        return undefined;
+    }
+    exports.compileServer = task(function () {
+        var folder = path.join(), fileset = nake.fileSetSync(folder);
+        return doCompile(fileset, moduleType);
+    });
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt
index 499536fc2566f..b1c070056b052 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 crashIntypeCheckObjectCreationExpression.ts(3,45): error TS2304: Cannot find name 'X'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== crashIntypeCheckObjectCreationExpression.ts (1 errors) ====
     export class BuildWorkspaceService {
         public injectRequestService<P0, P1, P2>(service: P0) {
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.errors.txt b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.errors.txt
deleted file mode 100644
index 1db94ea8bda4c..0000000000000
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== declFileExportAssignmentOfGenericInterface_1.ts (0 errors) ====
-    import a = require('declFileExportAssignmentOfGenericInterface_0');
-    export var x: a<a<string>>;
-    x.a;
-==== declFileExportAssignmentOfGenericInterface_0.ts (0 errors) ====
-    interface Foo<T> {
-        a: string;
-    }
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileExportImportChain.errors.txt b/tests/baselines/reference/declFileExportImportChain.errors.txt
deleted file mode 100644
index ada1a14a394ee..0000000000000
--- a/tests/baselines/reference/declFileExportImportChain.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== declFileExportImportChain_d.ts (0 errors) ====
-    import c = require("declFileExportImportChain_c");
-    export var x: c.b1.a.m2.c1;
-==== declFileExportImportChain_a.ts (0 errors) ====
-    namespace m1 {
-        export namespace m2 {
-            export class c1 {
-            }
-        }
-    }
-    export = m1;
-    
-==== declFileExportImportChain_b.ts (0 errors) ====
-    export import a = require("declFileExportImportChain_a");
-    
-==== declFileExportImportChain_b1.ts (0 errors) ====
-    import b = require("declFileExportImportChain_b");
-    export = b;
-    
-==== declFileExportImportChain_c.ts (0 errors) ====
-    export import b1 = require("declFileExportImportChain_b1");
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileExportImportChain2.errors.txt b/tests/baselines/reference/declFileExportImportChain2.errors.txt
deleted file mode 100644
index f9049968335b9..0000000000000
--- a/tests/baselines/reference/declFileExportImportChain2.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== declFileExportImportChain2_d.ts (0 errors) ====
-    import c = require("declFileExportImportChain2_c");
-    export var x: c.b.m2.c1;
-==== declFileExportImportChain2_a.ts (0 errors) ====
-    namespace m1 {
-        export namespace m2 {
-            export class c1 {
-            }
-        }
-    }
-    export = m1;
-    
-==== declFileExportImportChain2_b.ts (0 errors) ====
-    import a = require("declFileExportImportChain2_a");
-    export = a;
-    
-==== declFileExportImportChain2_c.ts (0 errors) ====
-    export import b = require("declFileExportImportChain2_b");
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt b/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
deleted file mode 100644
index f5d93de80e5ea..0000000000000
--- a/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== declarationEmitAmdModuleDefault.ts (0 errors) ====
-    export default class DefaultClass { }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitAmdModuleNameDirective.errors.txt b/tests/baselines/reference/declarationEmitAmdModuleNameDirective.errors.txt
deleted file mode 100644
index b6433574483c9..0000000000000
--- a/tests/baselines/reference/declarationEmitAmdModuleNameDirective.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    /// <amd-module name="name_of_foo"/>
-    export const foo = 1;
-==== bar.ts (0 errors) ====
-    /// <amd-dependency name="name_of_foo" path="./foo" />
-    import {foo} from './foo';
-    void foo;
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js b/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js
index b8bd49a7405dc..ba0c87ed11d33 100644
--- a/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js
+++ b/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js
@@ -13,12 +13,9 @@ export class C {
 
 //// [main.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.C = void 0;
-var abcdefgh_1 = __importDefault(require("abcdefgh"));
+var abcdefgh_1 = require("abcdefgh");
 var C = /** @class */ (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
deleted file mode 100644
index 50a797b87f127..0000000000000
--- a/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== lib/lib.d.ts (0 errors) ====
-    declare module "lib/result" {
-        export type Result<E extends Error, T> = (E & Failure<E>) | (T & Success<T>);
-        export interface Failure<E extends Error> { }
-        export interface Success<T> { }
-    }
-    
-==== src/datastore_result.ts (0 errors) ====
-    import { Result } from "lib/result";
-    
-    export type T<T> = Result<Error, T>;
-    
-==== src/conditional_directive_field.ts (0 errors) ====
-    import * as DatastoreResult from "src/datastore_result";
-    
-    export const build = (): DatastoreResult.T<string> => {
-    	return null;
-    };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js b/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js
index 16e213e284790..ee68e8bde1fc4 100644
--- a/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js
+++ b/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js
@@ -24,12 +24,9 @@ var EnumExample;
 exports.default = EnumExample;
 //// [index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-var EnumExample_1 = __importDefault(require("./EnumExample"));
+var EnumExample_1 = require("./EnumExample");
 exports.default = (_a = {},
     _a[EnumExample_1.default.TEST] = {},
     _a);
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt
deleted file mode 100644
index 6e43f0a6d1213..0000000000000
--- a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== pi.ts (0 errors) ====
-    export default 3.14159;
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
deleted file mode 100644
index 6e43f0a6d1213..0000000000000
--- a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== pi.ts (0 errors) ====
-    export default 3.14159;
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
index ea9dd13020980..be310547f31b4 100644
--- a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
+++ b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
@@ -23,42 +23,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (function (suit, rank) { return ({ suit: suit, rank: rank }); });
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyCard = void 0;
-var lazyCard = function () { return Promise.resolve().then(function () { return __importStar(require('./Card')); }).then(function (a) { return a.default; }); };
+var lazyCard = function () { return Promise.resolve().then(function () { return require('./Card'); }).then(function (a) { return a.default; }); };
 exports.lazyCard = lazyCard;
 
 
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends6.js b/tests/baselines/reference/declarationEmitExpressionInExtends6.js
index 79ac7adf946b0..6c21847ad5f54 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends6.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends6.js
@@ -39,41 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var A = __importStar(require("./a"));
+var A = require("./a");
 var Foo = A.Foo;
 var default_1 = /** @class */ (function (_super) {
     __extends(default_1, _super);
diff --git a/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js b/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
index 8ffaa6ca566b2..574351724ac86 100644
--- a/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
+++ b/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
@@ -26,11 +26,8 @@ function fn(sliceIndex) {
 exports.default = { fn: fn };
 //// [reexport.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = __importDefault(require("./types"));
+var types_1 = require("./types");
 exports.default = { test: types_1.default };
 
 
diff --git a/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js b/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js
index 7a7bbb6153d03..b4971867e6f25 100644
--- a/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js
+++ b/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js
@@ -20,42 +20,9 @@ export const timestamp = now();
 
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.timestamp = void 0;
-var x = __importStar(require("./a"));
+var x = require("./a");
 exports.timestamp = x.now();
 //// [c.js]
 "use strict";
diff --git a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js
index 5847f5e532fbf..ac4336bf89c3b 100644
--- a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js
+++ b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js
@@ -42,12 +42,9 @@ export default Object.assign(A, {
 
 //// [index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.C = void 0;
-const styled_components_1 = __importDefault(require("styled-components"));
+const styled_components_1 = require("styled-components");
 const A = styled_components_1.default.div ``;
 const B = styled_components_1.default.div ``;
 exports.C = styled_components_1.default.div ``;
diff --git a/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.js b/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.js
index e2fabbf6c3c0e..f5bea8519e360 100644
--- a/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.js
+++ b/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.js
@@ -21,41 +21,8 @@ var C = /** @class */ (function () {
 exports.D = C;
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a = __importStar(require("./a"));
+var a = require("./a");
 exports.default = a.D;
 
 
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
index 61dd1f4f22343..b973b452e13b5 100644
--- a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
@@ -1,11 +1,9 @@
 error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== src/lib/operators/scalar.ts (0 errors) ====
     export interface Scalar {
     	(): string;
diff --git a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
index e8823265f60da..3bbe347a63e50 100644
--- a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
+++ b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
@@ -11,42 +11,9 @@ export const run = <E>(i: () => E.Whatever<E>): E.Whatever<E> => E.something(i);
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-var E = __importStar(require("whatever"));
+var E = require("whatever");
 var run = function (i) { return E.something(i); };
 exports.run = run;
 
diff --git a/tests/baselines/reference/declarationEmitTypeofDefaultExport.js b/tests/baselines/reference/declarationEmitTypeofDefaultExport.js
index 4f3d8baf25aad..428c9b460143d 100644
--- a/tests/baselines/reference/declarationEmitTypeofDefaultExport.js
+++ b/tests/baselines/reference/declarationEmitTypeofDefaultExport.js
@@ -20,41 +20,8 @@ exports.default = C;
 ;
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a = __importStar(require("./a"));
+var a = require("./a");
 exports.default = a.default;
 
 
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
index 508194147882c..705a55a488557 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
@@ -25,13 +25,10 @@ exports.default = createExperiment({
 });
 //// [main.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.obj = void 0;
-var other_1 = __importDefault(require("./other"));
+var other_1 = require("./other");
 exports.obj = (_a = {},
     _a[other_1.default.name] = 1,
     _a);
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
index a05efa3157b35..e2f1d4c613561 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
@@ -25,43 +25,10 @@ exports.default = createExperiment({
 });
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.obj = void 0;
-var other2 = __importStar(require("./other"));
+var other2 = require("./other");
 exports.obj = (_a = {},
     _a[other2.default.name] = 1,
     _a);
diff --git a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js
index 8d483fbbf1a2e..194d17c7ce6ba 100644
--- a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js
+++ b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js
@@ -11,9 +11,6 @@ export default val;
 
 //// [main.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var data_json_1 = __importDefault(require("./data.json"));
+var data_json_1 = require("./data.json");
 var x = data_json_1.default;
diff --git a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js
index 8d483fbbf1a2e..194d17c7ce6ba 100644
--- a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js
+++ b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js
@@ -11,9 +11,6 @@ export default val;
 
 //// [main.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var data_json_1 = __importDefault(require("./data.json"));
+var data_json_1 = require("./data.json");
 var x = data_json_1.default;
diff --git a/tests/baselines/reference/declarationMapsOutFile.errors.txt b/tests/baselines/reference/declarationMapsOutFile.errors.txt
deleted file mode 100644
index 8732b01aa92ca..0000000000000
--- a/tests/baselines/reference/declarationMapsOutFile.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class Foo {
-        doThing(x: {a: number}) {
-            return {b: x.a};
-        }
-        static make() {
-            return new Foo();
-        }
-    }
-==== index.ts (0 errors) ====
-    import {Foo} from "./a";
-    
-    const c = new Foo();
-    c.doThing({a: 42});
-    
-    export let x = c.doThing({a: 12});
-    export { c, Foo };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationMerging2.errors.txt b/tests/baselines/reference/declarationMerging2.errors.txt
deleted file mode 100644
index e7d98bca5e94b..0000000000000
--- a/tests/baselines/reference/declarationMerging2.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A {
-        protected _f: number;
-        getF() { return this._f; }
-    }
-    
-==== b.ts (0 errors) ====
-    export {}
-    declare module "./a" {
-        interface A {
-            run();
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js b/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js
index 57182a5e257b6..cdea881196976 100644
--- a/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js
+++ b/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js
@@ -20,45 +20,13 @@ export const MyComp = Ctor.extends({foo: "bar"});
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComp = void 0;
-var ns = __importStar(require("mod"));
+var ns = require("mod");
 var Ctor = ns.default;
 exports.MyComp = Ctor.extends({ foo: "bar" });
 
 
 //// [index.d.ts]
-export declare const MyComp: import("mod/ctor").ExtendedCtor<import("mod").default>;
+import * as ns from "mod";
+export declare const MyComp: import("mod/ctor").ExtendedCtor<ns.default>;
diff --git a/tests/baselines/reference/decoratedClassExportsSystem1.errors.txt b/tests/baselines/reference/decoratedClassExportsSystem1.errors.txt
deleted file mode 100644
index eb58f2d11abb0..0000000000000
--- a/tests/baselines/reference/decoratedClassExportsSystem1.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    declare function forwardRef(x: any): any;
-    declare var Something: any;
-    @Something({ v: () => Testing123 })
-    export class Testing123 {
-        static prop0: string;
-        static prop1 = Testing123.prop0;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratedClassExportsSystem1.types b/tests/baselines/reference/decoratedClassExportsSystem1.types
index b58772b93a374..26ab62feeecf0 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem1.types
+++ b/tests/baselines/reference/decoratedClassExportsSystem1.types
@@ -5,17 +5,13 @@ declare function forwardRef(x: any): any;
 >forwardRef : (x: any) => any
 >           : ^ ^^   ^^^^^   
 >x : any
->  : ^^^
 
 declare var Something: any;
 >Something : any
->          : ^^^
 
 @Something({ v: () => Testing123 })
 >Something({ v: () => Testing123 }) : any
->                                   : ^^^
 >Something : any
->          : ^^^
 >{ v: () => Testing123 } : { v: () => typeof Testing123; }
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >v : () => typeof Testing123
diff --git a/tests/baselines/reference/decoratedClassExportsSystem2.errors.txt b/tests/baselines/reference/decoratedClassExportsSystem2.errors.txt
deleted file mode 100644
index 5941fbc37f44f..0000000000000
--- a/tests/baselines/reference/decoratedClassExportsSystem2.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    declare function forwardRef(x: any): any;
-    declare var Something: any;
-    @Something({ v: () => Testing123 })
-    export class Testing123 { }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratedClassExportsSystem2.types b/tests/baselines/reference/decoratedClassExportsSystem2.types
index b8f242fc8fa87..3da3d09187ff4 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem2.types
+++ b/tests/baselines/reference/decoratedClassExportsSystem2.types
@@ -5,17 +5,13 @@ declare function forwardRef(x: any): any;
 >forwardRef : (x: any) => any
 >           : ^ ^^   ^^^^^   
 >x : any
->  : ^^^
 
 declare var Something: any;
 >Something : any
->          : ^^^
 
 @Something({ v: () => Testing123 })
 >Something({ v: () => Testing123 }) : any
->                                   : ^^^
 >Something : any
->          : ^^^
 >{ v: () => Testing123 } : { v: () => typeof Testing123; }
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >v : () => typeof Testing123
diff --git a/tests/baselines/reference/decoratedClassFromExternalModule.errors.txt b/tests/baselines/reference/decoratedClassFromExternalModule.errors.txt
deleted file mode 100644
index a12f24078e41e..0000000000000
--- a/tests/baselines/reference/decoratedClassFromExternalModule.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-undecorated.ts(1,23): error TS2307: Cannot find module 'decorated' or its corresponding type declarations.
-
-
-==== decorated.ts (0 errors) ====
-    function decorate(target: any) { }
-    
-    @decorate
-    export default class Decorated { }
-    
-==== undecorated.ts (1 errors) ====
-    import Decorated from 'decorated';
-                          ~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'decorated' or its corresponding type declarations.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratedClassFromExternalModule.types b/tests/baselines/reference/decoratedClassFromExternalModule.types
index 5b4c4a914f0e5..49b9730a3ea7f 100644
--- a/tests/baselines/reference/decoratedClassFromExternalModule.types
+++ b/tests/baselines/reference/decoratedClassFromExternalModule.types
@@ -5,7 +5,6 @@ function decorate(target: any) { }
 >decorate : (target: any) => void
 >         : ^      ^^   ^^^^^^^^^
 >target : any
->       : ^^^
 
 @decorate
 >decorate : (target: any) => void
@@ -17,6 +16,6 @@ export default class Decorated { }
 
 === undecorated.ts ===
 import Decorated from 'decorated';
->Decorated : any
->          : ^^^
+>Decorated : typeof Decorated
+>          : ^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt
deleted file mode 100644
index b64a7fd4844e6..0000000000000
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    var decorator: ClassDecorator;
-    
-    @decorator
-    export default class Foo {}
-    
-==== b.ts (0 errors) ====
-    var decorator: ClassDecorator;
-    
-    @decorator
-    export default class {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.errors.txt b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.errors.txt
deleted file mode 100644
index 28709a2ceab5d..0000000000000
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    var decorator: ClassDecorator;
-    
-    @decorator
-    export default class Foo {}
-    
-==== b.ts (0 errors) ====
-    var decorator: ClassDecorator;
-    
-    @decorator
-    export default class {}
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.errors.txt b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.errors.txt
deleted file mode 100644
index c27488d906117..0000000000000
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    var decorator: ClassDecorator;
-    
-    @decorator
-    export default class Foo {}
-    
-==== b.ts (0 errors) ====
-    var decorator: ClassDecorator;
-    
-    @decorator
-    export default class {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index d89535c9db13d..4e411154ec1fc 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -38,11 +38,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var service_1 = __importDefault(require("./service"));
+var service_1 = require("./service");
 var MyComponent = /** @class */ (function () {
     function MyComponent(Service) {
         this.Service = Service;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 40ed680978a7b..f4c3fec80ae7a 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -39,7 +39,7 @@ exports.db = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = __importDefault(require("./db")); // error no default export
+var db_1 = require("./db"); // error no default export
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index 98e3f0c13a1ad..529b65fc31824 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -38,7 +38,7 @@ exports.default = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = __importDefault(require("./db"));
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index a0d148f6be4ef..f7907f1f8763c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -38,7 +38,7 @@ exports.default = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = __importDefault(require("./db"));
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index a3f3b4c5dacd1..0cb79a8b2e97c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -38,7 +38,7 @@ exports.default = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = __importDefault(require("./db"));
+var db_1 = require("./db");
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/decoratorOnAwait.errors.txt b/tests/baselines/reference/decoratorOnAwait.errors.txt
deleted file mode 100644
index 72a64f3c7d865..0000000000000
--- a/tests/baselines/reference/decoratorOnAwait.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-decoratorOnAwait.ts(3,5): error TS1146: Declaration expected.
-
-
-==== decoratorOnAwait.ts (1 errors) ====
-    declare function dec<T>(target: T): T;
-    
-    @dec
-        
-!!! error TS1146: Declaration expected.
-    await 1
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnAwait.js b/tests/baselines/reference/decoratorOnAwait.js
deleted file mode 100644
index c8a0546e388ff..0000000000000
--- a/tests/baselines/reference/decoratorOnAwait.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//// [tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts] ////
-
-//// [decoratorOnAwait.ts]
-declare function dec<T>(target: T): T;
-
-@dec
-await 1
-
-
-//// [decoratorOnAwait.js]
-await 1;
diff --git a/tests/baselines/reference/decoratorOnAwait.symbols b/tests/baselines/reference/decoratorOnAwait.symbols
deleted file mode 100644
index a2c9ac6a3a10f..0000000000000
--- a/tests/baselines/reference/decoratorOnAwait.symbols
+++ /dev/null
@@ -1,15 +0,0 @@
-//// [tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts] ////
-
-=== decoratorOnAwait.ts ===
-declare function dec<T>(target: T): T;
->dec : Symbol(dec, Decl(decoratorOnAwait.ts, 0, 0))
->T : Symbol(T, Decl(decoratorOnAwait.ts, 0, 21))
->target : Symbol(target, Decl(decoratorOnAwait.ts, 0, 24))
->T : Symbol(T, Decl(decoratorOnAwait.ts, 0, 21))
->T : Symbol(T, Decl(decoratorOnAwait.ts, 0, 21))
-
-@dec
->dec : Symbol(dec, Decl(decoratorOnAwait.ts, 0, 0))
-
-await 1
-
diff --git a/tests/baselines/reference/decoratorOnAwait.types b/tests/baselines/reference/decoratorOnAwait.types
deleted file mode 100644
index f5a3ec4681d42..0000000000000
--- a/tests/baselines/reference/decoratorOnAwait.types
+++ /dev/null
@@ -1,19 +0,0 @@
-//// [tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts] ////
-
-=== decoratorOnAwait.ts ===
-declare function dec<T>(target: T): T;
->dec : <T>(target: T) => T
->    : ^ ^^      ^^ ^^^^^ 
->target : T
->       : ^
-
-@dec
->dec : <T>(target: T) => T
->    : ^ ^^      ^^ ^^^^^ 
-
-await 1
->await 1 : 1
->        : ^
->1 : 1
->  : ^
-
diff --git a/tests/baselines/reference/decoratorOnUsing.errors.txt b/tests/baselines/reference/decoratorOnUsing.errors.txt
deleted file mode 100644
index 1861fa34a32e8..0000000000000
--- a/tests/baselines/reference/decoratorOnUsing.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-decoratorOnUsing.ts(4,7): error TS1134: Variable declaration expected.
-
-
-==== decoratorOnUsing.ts (1 errors) ====
-    declare function dec<T>(target: T): T;
-    
-    @dec
-    using 1
-          ~
-!!! error TS1134: Variable declaration expected.
-    
-    @dec
-    using x
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnUsing.js b/tests/baselines/reference/decoratorOnUsing.js
deleted file mode 100644
index 47b470c658d9b..0000000000000
--- a/tests/baselines/reference/decoratorOnUsing.js
+++ /dev/null
@@ -1,16 +0,0 @@
-//// [tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts] ////
-
-//// [decoratorOnUsing.ts]
-declare function dec<T>(target: T): T;
-
-@dec
-using 1
-
-@dec
-using x
-
-
-//// [decoratorOnUsing.js]
-using ;
-1;
-using x;
diff --git a/tests/baselines/reference/decoratorOnUsing.symbols b/tests/baselines/reference/decoratorOnUsing.symbols
deleted file mode 100644
index a173c7e318502..0000000000000
--- a/tests/baselines/reference/decoratorOnUsing.symbols
+++ /dev/null
@@ -1,21 +0,0 @@
-//// [tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts] ////
-
-=== decoratorOnUsing.ts ===
-declare function dec<T>(target: T): T;
->dec : Symbol(dec, Decl(decoratorOnUsing.ts, 0, 0))
->T : Symbol(T, Decl(decoratorOnUsing.ts, 0, 21))
->target : Symbol(target, Decl(decoratorOnUsing.ts, 0, 24))
->T : Symbol(T, Decl(decoratorOnUsing.ts, 0, 21))
->T : Symbol(T, Decl(decoratorOnUsing.ts, 0, 21))
-
-@dec
->dec : Symbol(dec, Decl(decoratorOnUsing.ts, 0, 0))
-
-using 1
-
-@dec
->dec : Symbol(dec, Decl(decoratorOnUsing.ts, 0, 0))
-
-using x
->x : Symbol(x, Decl(decoratorOnUsing.ts, 6, 5))
-
diff --git a/tests/baselines/reference/decoratorOnUsing.types b/tests/baselines/reference/decoratorOnUsing.types
deleted file mode 100644
index cb108be89851e..0000000000000
--- a/tests/baselines/reference/decoratorOnUsing.types
+++ /dev/null
@@ -1,25 +0,0 @@
-//// [tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts] ////
-
-=== decoratorOnUsing.ts ===
-declare function dec<T>(target: T): T;
->dec : <T>(target: T) => T
->    : ^ ^^      ^^ ^^^^^ 
->target : T
->       : ^
-
-@dec
->dec : <T>(target: T) => T
->    : ^ ^^      ^^ ^^^^^ 
-
-using 1
->1 : 1
->  : ^
-
-@dec
->dec : <T>(target: T) => T
->    : ^ ^^      ^^ ^^^^^ 
-
-using x
->x : any
->  : ^^^
-
diff --git a/tests/baselines/reference/deduplicateImportsInSystem.errors.txt b/tests/baselines/reference/deduplicateImportsInSystem.errors.txt
index 7b2b25dcce818..1436db7ab264b 100644
--- a/tests/baselines/reference/deduplicateImportsInSystem.errors.txt
+++ b/tests/baselines/reference/deduplicateImportsInSystem.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 deduplicateImportsInSystem.ts(1,17): error TS2792: Cannot find module 'f1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 deduplicateImportsInSystem.ts(2,17): error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 deduplicateImportsInSystem.ts(3,17): error TS2792: Cannot find module 'f3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -7,7 +6,6 @@ deduplicateImportsInSystem.ts(5,17): error TS2792: Cannot find module 'f2'. Did
 deduplicateImportsInSystem.ts(6,17): error TS2792: Cannot find module 'f1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== deduplicateImportsInSystem.ts (6 errors) ====
     import {A} from "f1";
                     ~~~~
diff --git a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js
index 831a949171356..bee6dc859759d 100644
--- a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js
+++ b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js
@@ -23,43 +23,10 @@ export namespace Something {
 
 //// [this.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Something = void 0;
 exports.make = make;
-var me = __importStar(require("./this"));
+var me = require("./this");
 function make(x) {
     return null;
 }
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt b/tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt
deleted file mode 100644
index c732d5e0374d7..0000000000000
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
-    export default x;
-    
-==== b.ts (0 errors) ====
-    import x from './a';
-    
-    ( async function() {
-        const value = await x;
-    }() );
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 33b6d262d666a..950c114113602 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -37,9 +37,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -51,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    const a_1 = __importDefault(require("./a"));
+    const a_1 = require("./a");
     (function () {
         return __awaiter(this, void 0, void 0, function* () {
             const value = yield a_1.default;
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index 64c5f6d98b6a6..8aa41a6b52af0 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -28,11 +28,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const a_1 = __importDefault(require("./a"));
+const a_1 = require("./a");
 (function () {
     return __awaiter(this, void 0, void 0, function* () {
         const value = yield a_1.default;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index 521b6e010afd5..7063441df4a3f 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -42,11 +42,8 @@ function Decl() {
 })(Decl || (Decl = {}));
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("m1"));
+var m1_1 = require("m1");
 (0, m1_1.default)();
 var x;
 var y;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index 84fe76820df66..abb13d082b1c9 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -35,11 +35,8 @@ var Decl = /** @class */ (function () {
 exports.default = Decl;
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("m1"));
+var m1_1 = require("m1");
 (0, m1_1.default)();
 var x;
 var y;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 3d725b3ab72bb..d52ffec5ec93a 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -35,11 +35,8 @@ var Decl = /** @class */ (function () {
 exports.default = Decl;
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("m1"));
+var m1_1 = require("m1");
 (0, m1_1.default)();
 var x;
 var y;
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt b/tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt
deleted file mode 100644
index 732344d6d0767..0000000000000
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class Foo {}
-    
-==== b.ts (0 errors) ====
-    export default function foo() {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.errors.txt b/tests/baselines/reference/defaultExportsGetExportedSystem.errors.txt
deleted file mode 100644
index ef493e8916dc0..0000000000000
--- a/tests/baselines/reference/defaultExportsGetExportedSystem.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class Foo {}
-    
-==== b.ts (0 errors) ====
-    export default function foo() {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.errors.txt b/tests/baselines/reference/defaultExportsGetExportedUmd.errors.txt
deleted file mode 100644
index de3992a2ab2c9..0000000000000
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class Foo {}
-    
-==== b.ts (0 errors) ====
-    export default function foo() {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/dependencyViaImportAlias.errors.txt b/tests/baselines/reference/dependencyViaImportAlias.errors.txt
deleted file mode 100644
index 844e280bc7f53..0000000000000
--- a/tests/baselines/reference/dependencyViaImportAlias.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== B.ts (0 errors) ====
-    import a = require('A');
-    
-    import A = a.A;
-    
-    export = A;
-==== A.ts (0 errors) ====
-    export class A {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/deprecatedCompilerOptions2.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions2.errors.txt
deleted file mode 100644
index 4e16fb63f207d..0000000000000
--- a/tests/baselines/reference/deprecatedCompilerOptions2.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/foo/tsconfig.json(3,19): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== /foo/tsconfig.json (1 errors) ====
-    {
-        "compilerOptions": {
-            "module": "amd",
-                      ~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "target": "ES3",
-            "noImplicitUseStrict": true,
-            "keyofStringsOnly": true,
-            "suppressExcessPropertyErrors": true,
-            "suppressImplicitAnyIndexErrors": true,
-            "noStrictGenericChecks": true,
-            "charset": "utf8",
-            "out": "dist.js",
-            "ignoreDeprecations": "5.0"
-        }
-    }
-    
-==== /foo/a.ts (0 errors) ====
-    const a = 1;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt b/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
index 401c87dd813f0..1d97da4493ad2 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
@@ -1,4 +1,3 @@
-/foo/tsconfig.json(3,19): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /foo/tsconfig.json(4,19): error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
 /foo/tsconfig.json(5,9): error TS5101: Option 'noImplicitUseStrict' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
 /foo/tsconfig.json(6,9): error TS5101: Option 'keyofStringsOnly' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
@@ -11,12 +10,10 @@
 /foo/tsconfig.json(12,31): error TS5103: Invalid value for '--ignoreDeprecations'.
 
 
-==== /foo/tsconfig.json (10 errors) ====
+==== /foo/tsconfig.json (9 errors) ====
     {
         "compilerOptions": {
             "module": "amd",
-                      ~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "target": "ES3",
                       ~~~~~
 !!! error TS5107: Option 'target=ES3' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.errors.txt b/tests/baselines/reference/destructuringInVariableDeclarations3.errors.txt
deleted file mode 100644
index f96056623b6ac..0000000000000
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== destructuringInVariableDeclarations3.ts (0 errors) ====
-    export let { toString } = 1;
-    {
-        let { toFixed } = 1;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.errors.txt b/tests/baselines/reference/destructuringInVariableDeclarations4.errors.txt
deleted file mode 100644
index 3604304be0b31..0000000000000
--- a/tests/baselines/reference/destructuringInVariableDeclarations4.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== destructuringInVariableDeclarations4.ts (0 errors) ====
-    let { toString } = 1;
-    {
-        let { toFixed } = 1;
-    }
-    export {};
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.errors.txt b/tests/baselines/reference/destructuringInVariableDeclarations5.errors.txt
deleted file mode 100644
index 7de7f1e7395cf..0000000000000
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== destructuringInVariableDeclarations5.ts (0 errors) ====
-    export let { toString } = 1;
-    {
-        let { toFixed } = 1;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.errors.txt b/tests/baselines/reference/destructuringInVariableDeclarations6.errors.txt
deleted file mode 100644
index 2027d59a689c4..0000000000000
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== destructuringInVariableDeclarations6.ts (0 errors) ====
-    let { toString } = 1;
-    {
-        let { toFixed } = 1;
-    }
-    export {};
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations7.errors.txt b/tests/baselines/reference/destructuringInVariableDeclarations7.errors.txt
deleted file mode 100644
index 81fbe072046eb..0000000000000
--- a/tests/baselines/reference/destructuringInVariableDeclarations7.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== destructuringInVariableDeclarations7.ts (0 errors) ====
-    export let { toString } = 1;
-    {
-        let { toFixed } = 1;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations8.errors.txt b/tests/baselines/reference/destructuringInVariableDeclarations8.errors.txt
deleted file mode 100644
index 6065428600add..0000000000000
--- a/tests/baselines/reference/destructuringInVariableDeclarations8.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== destructuringInVariableDeclarations8.ts (0 errors) ====
-    let { toString } = 1;
-    {
-        let { toFixed } = 1;
-    }
-    export {};
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/dottedNamesInSystem.errors.txt b/tests/baselines/reference/dottedNamesInSystem.errors.txt
deleted file mode 100644
index c2edb41183fd0..0000000000000
--- a/tests/baselines/reference/dottedNamesInSystem.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== dottedNamesInSystem.ts (0 errors) ====
-    export namespace A.B.C {
-        export function foo() {}
-    }
-    
-    export function bar() {
-        return A.B.C.foo();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
deleted file mode 100644
index b77245686dbd9..0000000000000
--- a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.ts (0 errors) ====
-    export interface IPoint {}
-    
-    export namespace Shapes {
-    
-        export class Point implements IPoint {}
-    
-    }
-    
-==== duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_1.ts (0 errors) ====
-    //var x = new Shapes.Point();
-    //interface IPoint {}
-    
-    //namespace Shapes {
-    
-    //    export class Point implements IPoint {}
-    
-    //}
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index 0e692ae75e41b..814fa3c4d2906 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,42 +38,47 @@ export var tests: TestRunner = (function () {
 })();
 
 //// [duplicateLocalVariable2.js]
-var TestCase = /** @class */ (function () {
-    function TestCase(name, test, errorMessageRegEx) {
-        this.name = name;
-        this.test = test;
-        this.errorMessageRegEx = errorMessageRegEx;
-    }
-    return TestCase;
-}());
-export { TestCase };
-var TestRunner = /** @class */ (function () {
-    function TestRunner() {
-    }
-    TestRunner.arrayCompare = function (arg1, arg2) {
-        return false;
-    };
-    TestRunner.prototype.addTest = function (test) {
-    };
-    return TestRunner;
-}());
-export { TestRunner };
-export var tests = (function () {
-    var testRunner = new TestRunner();
-    testRunner.addTest(new TestCase("Check UTF8 encoding", function () {
-        var fb;
-        fb.writeUtf8Bom();
-        var chars = [0x0054];
-        for (var i in chars) {
-            fb.writeUtf8CodePoint(chars[i]);
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.tests = exports.TestRunner = exports.TestCase = void 0;
+    var TestCase = /** @class */ (function () {
+        function TestCase(name, test, errorMessageRegEx) {
+            this.name = name;
+            this.test = test;
+            this.errorMessageRegEx = errorMessageRegEx;
         }
-        fb.index = 0;
-        var bytes = [];
-        for (var i = 0; i < 14; i++) {
-            bytes.push(fb.readByte());
+        return TestCase;
+    }());
+    exports.TestCase = TestCase;
+    var TestRunner = /** @class */ (function () {
+        function TestRunner() {
         }
-        var expected = [0xEF];
-        return TestRunner.arrayCompare(bytes, expected);
-    }));
-    return testRunner;
-})();
+        TestRunner.arrayCompare = function (arg1, arg2) {
+            return false;
+        };
+        TestRunner.prototype.addTest = function (test) {
+        };
+        return TestRunner;
+    }());
+    exports.TestRunner = TestRunner;
+    exports.tests = (function () {
+        var testRunner = new TestRunner();
+        testRunner.addTest(new TestCase("Check UTF8 encoding", function () {
+            var fb;
+            fb.writeUtf8Bom();
+            var chars = [0x0054];
+            for (var i in chars) {
+                fb.writeUtf8CodePoint(chars[i]);
+            }
+            fb.index = 0;
+            var bytes = [];
+            for (var i = 0; i < 14; i++) {
+                bytes.push(fb.readByte());
+            }
+            var expected = [0xEF];
+            return TestRunner.arrayCompare(bytes, expected);
+        }));
+        return testRunner;
+    })();
+});
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js b/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js
index 60324dc25ea7b..bae6e0e16e052 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js
@@ -46,42 +46,9 @@ var E2;
 })(E2 || (exports.E2 = E2 = {}));
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
-var keys = __importStar(require("./a"));
+var keys = require("./a");
 var t1 = (_a = {},
     _a[keys.n] = 1,
     _a[keys.n] = 1,
diff --git a/tests/baselines/reference/duplicatePackage_referenceTypes.js b/tests/baselines/reference/duplicatePackage_referenceTypes.js
index 2b613d6813d12..7d85984caaafd 100644
--- a/tests/baselines/reference/duplicatePackage_referenceTypes.js
+++ b/tests/baselines/reference/duplicatePackage_referenceTypes.js
@@ -26,39 +26,6 @@ let foo: Foo = a.foo;
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a = __importStar(require("a"));
+var a = require("a");
 var foo = a.foo;
diff --git a/tests/baselines/reference/duplicatePackage_subModule.js b/tests/baselines/reference/duplicatePackage_subModule.js
index 9b7033b877997..7ef7136c0f3c6 100644
--- a/tests/baselines/reference/duplicatePackage_subModule.js
+++ b/tests/baselines/reference/duplicatePackage_subModule.js
@@ -29,39 +29,6 @@ const o: Foo = a.o;
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a = __importStar(require("a"));
+var a = require("a");
 var o = a.o;
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 0c62dbed38385..745f78bff88a2 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -68,40 +68,42 @@ interface D { }
 export interface D { }
 
 //// [duplicateSymbolsExportMatching.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// Should report error only once for instantiated module
-var M;
-(function (M) {
-    var inst;
-    (function (inst) {
-        var t;
-    })(inst || (inst = {}));
-    (function (inst) {
-        var t;
-    })(inst = M.inst || (M.inst = {}));
-})(M || (M = {}));
-// Variables of the same / different type
-var M2;
-(function (M2) {
-    var v;
-    var w;
-})(M2 || (M2 = {}));
-(function (M) {
-    var F;
-    (function (F) {
-        var t;
-    })(F || (F = {}));
-    function F() { } // Only one error for duplicate identifier (don't consider visibility)
-    M.F = F;
-})(M || (M = {}));
-(function (M) {
-    var C = /** @class */ (function () {
-        function C() {
-        }
-        return C;
-    }());
-    (function (C) {
-        var t;
-    })(C = M.C || (M.C = {}));
-})(M || (M = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // Should report error only once for instantiated module
+    var M;
+    (function (M) {
+        var inst;
+        (function (inst) {
+            var t;
+        })(inst || (inst = {}));
+        (function (inst) {
+            var t;
+        })(inst = M.inst || (M.inst = {}));
+    })(M || (M = {}));
+    // Variables of the same / different type
+    var M2;
+    (function (M2) {
+        var v;
+        var w;
+    })(M2 || (M2 = {}));
+    (function (M) {
+        var F;
+        (function (F) {
+            var t;
+        })(F || (F = {}));
+        function F() { } // Only one error for duplicate identifier (don't consider visibility)
+        M.F = F;
+    })(M || (M = {}));
+    (function (M) {
+        var C = /** @class */ (function () {
+            function C() {
+            }
+            return C;
+        }());
+        (function (C) {
+            var t;
+        })(C = M.C || (M.C = {}));
+    })(M || (M = {}));
+});
diff --git a/tests/baselines/reference/dynamicImportEvaluateSpecifier.js b/tests/baselines/reference/dynamicImportEvaluateSpecifier.js
index d69f1eee00c48..be247c57f0cba 100644
--- a/tests/baselines/reference/dynamicImportEvaluateSpecifier.js
+++ b/tests/baselines/reference/dynamicImportEvaluateSpecifier.js
@@ -18,47 +18,14 @@ const someFunction = async () => {
 
 
 //// [dynamicImportEvaluateSpecifier.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 // https://github.com/microsoft/TypeScript/issues/48285
 let i = 0;
-Promise.resolve(`${String(i++)}`).then(s => __importStar(require(s)));
-Promise.resolve(`${String(i++)}`).then(s => __importStar(require(s)));
+Promise.resolve(`${String(i++)}`).then(s => require(s));
+Promise.resolve(`${String(i++)}`).then(s => require(s));
 const getPath = async () => {
     /* in reality this would do some async FS operation, or a web request */
     return "/root/my/cool/path";
 };
 const someFunction = async () => {
-    const result = await Promise.resolve(`${await getPath()}`).then(s => __importStar(require(s)));
+    const result = await Promise.resolve(`${await getPath()}`).then(s => require(s));
 };
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.js b/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
index 7dc82fb5bd7e2..170719d33bb9a 100644
--- a/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
+++ b/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
@@ -9,42 +9,9 @@ export default {
 
 //// [dynamicImportInDefaultExportExpression.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     getInstance: function () {
-        return Promise.resolve().then(function () { return __importStar(require('./foo2')); });
+        return Promise.resolve().then(function () { return require('./foo2'); });
     }
 };
diff --git a/tests/baselines/reference/dynamicImportTrailingComma.js b/tests/baselines/reference/dynamicImportTrailingComma.js
index bec6abe6df0e3..cb4d532318e79 100644
--- a/tests/baselines/reference/dynamicImportTrailingComma.js
+++ b/tests/baselines/reference/dynamicImportTrailingComma.js
@@ -5,38 +5,5 @@ const path = './foo';
 import(path,);
 
 //// [dynamicImportTrailingComma.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var path = './foo';
-Promise.resolve("".concat(path)).then(function (s) { return __importStar(require(s)); });
+Promise.resolve("".concat(path)).then(function (s) { return require(s); });
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt
deleted file mode 100644
index 485d3a55c6717..0000000000000
--- a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== dynamicImportWithNestedThis_es2015.ts (0 errors) ====
-    // https://github.com/Microsoft/TypeScript/issues/17564
-    class C {
-    	private _path = './other';
-    
-    	dynamic() {
-    		return import(this._path);
-    	}
-    }
-    
-    const c = new C();
-    c.dynamic();
\ No newline at end of file
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js
index cd9a6dd92b87a..389e43baeb7ac 100644
--- a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js
+++ b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js
@@ -14,39 +14,6 @@ const c = new C();
 c.dynamic();
 
 //// [dynamicImportWithNestedThis_es2015.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -65,7 +32,7 @@ var __importStar = (this && this.__importStar) || (function () {
         }
         dynamic() {
             var _a;
-            return _a = this._path, __syncRequire ? Promise.resolve().then(() => __importStar(require(_a))) : new Promise((resolve_1, reject_1) => { require([_a], resolve_1, reject_1); }).then(__importStar);
+            return _a = this._path, __syncRequire ? Promise.resolve().then(() => require(_a)) : new Promise((resolve_1, reject_1) => { require([_a], resolve_1, reject_1); });
         }
     }
     const c = new C();
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt b/tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt
deleted file mode 100644
index dc99f48efb5e0..0000000000000
--- a/tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== dynamicImportWithNestedThis_es5.ts (0 errors) ====
-    // https://github.com/Microsoft/TypeScript/issues/17564
-    class C {
-    	private _path = './other';
-    
-    	dynamic() {
-    		return import(this._path);
-    	}
-    }
-    
-    const c = new C();
-    c.dynamic();
\ No newline at end of file
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es5.js b/tests/baselines/reference/dynamicImportWithNestedThis_es5.js
index 1c4f961bdc10e..d69dc1017563e 100644
--- a/tests/baselines/reference/dynamicImportWithNestedThis_es5.js
+++ b/tests/baselines/reference/dynamicImportWithNestedThis_es5.js
@@ -14,39 +14,6 @@ const c = new C();
 c.dynamic();
 
 //// [dynamicImportWithNestedThis_es5.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -65,7 +32,7 @@ var __importStar = (this && this.__importStar) || (function () {
         }
         C.prototype.dynamic = function () {
             var _a;
-            return _a = this._path, __syncRequire ? Promise.resolve().then(function () { return __importStar(require(_a)); }) : new Promise(function (resolve_1, reject_1) { require([_a], resolve_1, reject_1); }).then(__importStar);
+            return _a = this._path, __syncRequire ? Promise.resolve().then(function () { return require(_a); }) : new Promise(function (resolve_1, reject_1) { require([_a], resolve_1, reject_1); });
         };
         return C;
     }());
diff --git a/tests/baselines/reference/dynamicRequire.errors.txt b/tests/baselines/reference/dynamicRequire.errors.txt
deleted file mode 100644
index 7fb9861b1c809..0000000000000
--- a/tests/baselines/reference/dynamicRequire.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.js (0 errors) ====
-    function foo(name) {
-        var s = require("t/" + name)
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/dynamicRequire.types b/tests/baselines/reference/dynamicRequire.types
index 9e4308870ea39..fb62d1b5bf8a1 100644
--- a/tests/baselines/reference/dynamicRequire.types
+++ b/tests/baselines/reference/dynamicRequire.types
@@ -5,20 +5,15 @@ function foo(name) {
 >foo : (name: any) => void
 >    : ^    ^^^^^^^^^^^^^^
 >name : any
->     : ^^^
 
     var s = require("t/" + name)
 >s : any
->  : ^^^
 >require("t/" + name) : any
->                     : ^^^
 >require : any
->        : ^^^
 >"t/" + name : string
 >            : ^^^^^^
 >"t/" : "t/"
 >     : ^^^^
 >name : any
->     : ^^^
 }
 
diff --git a/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt b/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
deleted file mode 100644
index be3f26e9f4f17..0000000000000
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    /* Detached Comment */
-    
-    // Class Doo Comment
-    export class Doo {}
-    class Scooby extends Doo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBundleWithShebang1.errors.txt b/tests/baselines/reference/emitBundleWithShebang1.errors.txt
deleted file mode 100644
index 021ac05175bd5..0000000000000
--- a/tests/baselines/reference/emitBundleWithShebang1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== emitBundleWithShebang1.ts (0 errors) ====
-    #!/usr/bin/env gjs
-    class Doo {}
-    class Scooby extends Doo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBundleWithShebang2.errors.txt b/tests/baselines/reference/emitBundleWithShebang2.errors.txt
deleted file mode 100644
index a03d46fc493a9..0000000000000
--- a/tests/baselines/reference/emitBundleWithShebang2.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    #!/usr/bin/env gjs
-    class Doo {}
-    class Scooby extends Doo {}
-    
-==== test2.ts (0 errors) ====
-    #!/usr/bin/env js
-    class Dood {}
-    class Scoobyd extends Dood {}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
deleted file mode 100644
index 1664ccbe0bf8a..0000000000000
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    #!/usr/bin/env gjs
-    "use strict"
-    class Doo {}
-    class Scooby extends Doo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
deleted file mode 100644
index 5aa3055ef8c13..0000000000000
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    #!/usr/bin/env gjs
-    "use strict"
-    class Doo {}
-    class Scooby extends Doo {}
-    
-==== test1.ts (0 errors) ====
-    #!/usr/bin/env gjs
-    "use strict"
-    "Another prologue"
-    class Dood {}
-    class Scoobyd extends Dood {}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js b/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js
index c93e0199cbacc..da26c87e84ea5 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js
+++ b/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js
@@ -56,50 +56,17 @@ var C3 = /** @class */ (function () {
 exports.C3 = C3;
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var t1 = __importStar(require("./type1"));
+var t1 = require("./type1");
 var class3_1 = require("./class3");
 var HelloWorld = /** @class */ (function () {
     function HelloWorld() {
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt
deleted file mode 100644
index 4e61d07e8b4ba..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    declare var dec: any, __decorate: any;
-    @dec export class A {
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt
new file mode 100644
index 0000000000000..67291b1f976cd
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt
@@ -0,0 +1,12 @@
+error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node16'.
+
+
+!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node16'.
+==== a.ts (0 errors) ====
+    declare var dec: any, __decorate: any;
+    @dec export class A {
+    }
+    
+    const o = { a: 1 };
+    const y = { ...o };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).js
index 2bf5641f43b50..47204b7a76f30 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).js
@@ -10,20 +10,17 @@ const y = { ...o };
 
 
 //// [a.js]
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.A = void 0;
 let A = class A {
 };
-exports.A = A;
-exports.A = A = __decorate([
+A = __decorate([
     dec
 ], A);
+export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).errors.txt
new file mode 100644
index 0000000000000..7dfd532d52b18
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).errors.txt
@@ -0,0 +1,12 @@
+error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node18'.
+
+
+!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node18'.
+==== a.ts (0 errors) ====
+    declare var dec: any, __decorate: any;
+    @dec export class A {
+    }
+    
+    const o = { a: 1 };
+    const y = { ...o };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).js
index 2bf5641f43b50..47204b7a76f30 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).js
@@ -10,20 +10,17 @@ const y = { ...o };
 
 
 //// [a.js]
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.A = void 0;
 let A = class A {
 };
-exports.A = A;
-exports.A = A = __decorate([
+A = __decorate([
     dec
 ], A);
+export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).errors.txt
new file mode 100644
index 0000000000000..07470d26af612
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).errors.txt
@@ -0,0 +1,14 @@
+error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
+error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node20'.
+
+
+!!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
+!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node20'.
+==== a.ts (0 errors) ====
+    declare var dec: any, __decorate: any;
+    @dec export class A {
+    }
+    
+    const o = { a: 1 };
+    const y = { ...o };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).js
index 2bf5641f43b50..47204b7a76f30 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).js
@@ -10,20 +10,17 @@ const y = { ...o };
 
 
 //// [a.js]
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.A = void 0;
 let A = class A {
 };
-exports.A = A;
-exports.A = A = __decorate([
+A = __decorate([
     dec
 ], A);
+export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt
new file mode 100644
index 0000000000000..3537cb1753855
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt
@@ -0,0 +1,14 @@
+error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
+error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'.
+
+
+!!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
+!!! error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'.
+==== a.ts (0 errors) ====
+    declare var dec: any, __decorate: any;
+    @dec export class A {
+    }
+    
+    const o = { a: 1 };
+    const y = { ...o };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).js
index 2bf5641f43b50..47204b7a76f30 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).js
@@ -10,20 +10,17 @@ const y = { ...o };
 
 
 //// [a.js]
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.A = void 0;
 let A = class A {
 };
-exports.A = A;
-exports.A = A = __decorate([
+A = __decorate([
     dec
 ], A);
+export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).errors.txt
deleted file mode 100644
index a834448c84956..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    declare var dec: any, __decorate: any;
-    @dec export class A {
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).errors.txt
deleted file mode 100644
index 52bbe25be4955..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    declare var dec: any, __decorate: any;
-    @dec export class A {
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).errors.txt
deleted file mode 100644
index ca96dc816818a..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    declare var dec: any, __decorate: any;
-    @dec export class A {
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
index 0442043886f1e..a539507bd5ef5 100644
--- a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
+++ b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
@@ -16,39 +16,6 @@
 
 
 //// [a.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
     if (typeof path === "string" && /^\.\.?\//.test(path)) {
         return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
@@ -59,44 +26,11 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 };
 {
     require(__rewriteRelativeImportExtension("" + "./foo.ts"));
-    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => __importStar(require(s)));
+    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s));
     require("./foo.js");
-    Promise.resolve().then(() => __importStar(require("./foo.js")));
+    Promise.resolve().then(() => require("./foo.js"));
 }
 //// [b.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
     if (typeof path === "string" && /^\.\.?\//.test(path)) {
         return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
@@ -106,6 +40,6 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     return path;
 };
 {
-    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => __importStar(require(s)));
-    Promise.resolve().then(() => __importStar(require("./foo.js")));
+    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s));
+    Promise.resolve().then(() => require("./foo.js"));
 }
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index ba2274b44b5e6..7949a08daa179 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -22,41 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var A = __importStar(require(""));
+var A = require("");
 var B = /** @class */ (function (_super) {
     __extends(B, _super);
     function B() {
diff --git a/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt b/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt
index 2aaff41831d1c..48c2dfaf4dba8 100644
--- a/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt
+++ b/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt
@@ -1,4 +1,4 @@
-errorForBareSpecifierWithImplicitModuleResolutionNone.ts(3,23): error TS2307: Cannot find module 'non-existent-module' or its corresponding type declarations.
+errorForBareSpecifierWithImplicitModuleResolutionNone.ts(3,23): error TS2792: Cannot find module 'non-existent-module'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== errorForBareSpecifierWithImplicitModuleResolutionNone.ts (1 errors) ====
@@ -6,6 +6,6 @@ errorForBareSpecifierWithImplicitModuleResolutionNone.ts(3,23): error TS2307: Ca
     
     import { thing } from "non-existent-module";
                           ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'non-existent-module' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'non-existent-module'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     thing()
     
\ No newline at end of file
diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
index 6d366b763e501..4b30409af4236 100644
--- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js
+++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
@@ -8,39 +8,6 @@ import("./a");
 
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 exports.x = void 0;
-Promise.resolve().then(function () { return __importStar(require("./a")); });
+Promise.resolve().then(function () { return require("./a"); });
 module.exports = exports.x;
diff --git a/tests/baselines/reference/es5-amd.errors.txt b/tests/baselines/reference/es5-amd.errors.txt
deleted file mode 100644
index 894e40177a85b..0000000000000
--- a/tests/baselines/reference/es5-amd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-amd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-declaration-amd.errors.txt b/tests/baselines/reference/es5-declaration-amd.errors.txt
deleted file mode 100644
index 3fe9c569c8803..0000000000000
--- a/tests/baselines/reference/es5-declaration-amd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-declaration-amd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index d01de6ede62b8..03a239f92195d 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -8,7 +8,7 @@ export async function foo() {
 async function foo() {
 }
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols b/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols
index 5781f210fb6c1..c0f483062139e 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.symbols
@@ -10,51 +10,51 @@ async function foo() {
 >foo : Symbol(foo, Decl(script.ts, 0, 0))
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
->__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
->d : Symbol(d, Decl(index.d.ts, 0, 34))
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->b : Symbol(b, Decl(index.d.ts, 0, 46))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(index.d.ts, 0, 66))
->t : Symbol(t, Decl(index.d.ts, 1, 33))
->sources : Symbol(sources, Decl(index.d.ts, 1, 40))
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
->__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
->decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->target : Symbol(target, Decl(index.d.ts, 2, 58))
->key : Symbol(key, Decl(index.d.ts, 2, 71))
->desc : Symbol(desc, Decl(index.d.ts, 2, 94))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
->__param : Symbol(__param, Decl(index.d.ts, 2, 112))
->paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32))
->decorator : Symbol(decorator, Decl(index.d.ts, 3, 51))
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
->__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83))
->metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35))
->metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52))
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
->__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83))
->thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34))
->_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47))
->P : Symbol(P, Decl(index.d.ts, 5, 64))
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->generator : Symbol(generator, Decl(index.d.ts, 5, 77))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 export declare function __generator(body: Function): any;
->__generator : Symbol(__generator, Decl(index.d.ts, 5, 104))
->body : Symbol(body, Decl(index.d.ts, 6, 36))
+>__generator : Symbol(__generator, Decl(tslib.d.ts, --, --))
+>body : Symbol(body, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.types b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
index 6a5b209059eb6..f582f971bbb83 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
@@ -12,7 +12,7 @@ async function foo() {
 >    : ^^^^^^^^^^^^^^^^^^^
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >          : ^ ^^        ^^ ^^        ^^^^^    
diff --git a/tests/baselines/reference/es5-souremap-amd.errors.txt b/tests/baselines/reference/es5-souremap-amd.errors.txt
deleted file mode 100644
index 93608b3b5a9e3..0000000000000
--- a/tests/baselines/reference/es5-souremap-amd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-souremap-amd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-system.errors.txt b/tests/baselines/reference/es5-system.errors.txt
deleted file mode 100644
index 06a0b65c67577..0000000000000
--- a/tests/baselines/reference/es5-system.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-system.ts (0 errors) ====
-    export default class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-system2.errors.txt b/tests/baselines/reference/es5-system2.errors.txt
deleted file mode 100644
index 83ae01c4962f9..0000000000000
--- a/tests/baselines/reference/es5-system2.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-system2.ts (0 errors) ====
-    export var __esModule = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-umd.errors.txt b/tests/baselines/reference/es5-umd.errors.txt
deleted file mode 100644
index be610e68b84f1..0000000000000
--- a/tests/baselines/reference/es5-umd.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-umd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-umd2.errors.txt b/tests/baselines/reference/es5-umd2.errors.txt
deleted file mode 100644
index e4bde504f3a15..0000000000000
--- a/tests/baselines/reference/es5-umd2.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-umd2.ts (0 errors) ====
-    export class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-umd3.errors.txt b/tests/baselines/reference/es5-umd3.errors.txt
deleted file mode 100644
index ce88775497f94..0000000000000
--- a/tests/baselines/reference/es5-umd3.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-umd3.ts (0 errors) ====
-    export default class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-umd4.errors.txt b/tests/baselines/reference/es5-umd4.errors.txt
deleted file mode 100644
index 2f87d8562faf1..0000000000000
--- a/tests/baselines/reference/es5-umd4.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5-umd4.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
-    
-    export = A;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
index 869e875cf83cd..0963c4ef7fcbe 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
@@ -9,7 +9,7 @@ es5ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are no
 es5ModuleInternalNamedImports.ts(30,25): error TS1147: Import declarations in a namespace cannot reference a module.
 es5ModuleInternalNamedImports.ts(31,20): error TS1147: Import declarations in a namespace cannot reference a module.
 es5ModuleInternalNamedImports.ts(32,32): error TS1147: Import declarations in a namespace cannot reference a module.
-es5ModuleInternalNamedImports.ts(34,16): error TS2307: Cannot find module 'M3' or its corresponding type declarations.
+es5ModuleInternalNamedImports.ts(34,16): error TS2792: Cannot find module 'M3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== es5ModuleInternalNamedImports.ts (12 errors) ====
@@ -70,5 +70,5 @@ es5ModuleInternalNamedImports.ts(34,16): error TS2307: Cannot find module 'M3' o
     }
     import M3 from "M3";
                    ~~~~
-!!! error TS2307: Cannot find module 'M3' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'M3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index ac3e2197eceb5..28c43195e5860 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -38,32 +38,34 @@ import M3 from "M3";
 
 
 //// [es5ModuleInternalNamedImports.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.M = void 0;
-var M;
-(function (M) {
-    // variable
-    M.M_V = 0;
-    //calss
-    var M_C = /** @class */ (function () {
-        function M_C() {
-        }
-        return M_C;
-    }());
-    M.M_C = M_C;
-    // instantiated module
-    var M_M;
-    (function (M_M) {
-        var x;
-    })(M_M = M.M_M || (M.M_M = {}));
-    // function
-    function M_F() { }
-    M.M_F = M_F;
-    // enum
-    var M_E;
-    (function (M_E) {
-    })(M_E = M.M_E || (M.M_E = {}));
-    // alias
-    M.M_A = M_M;
-})(M || (exports.M = M = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.M = void 0;
+    var M;
+    (function (M) {
+        // variable
+        M.M_V = 0;
+        //calss
+        var M_C = /** @class */ (function () {
+            function M_C() {
+            }
+            return M_C;
+        }());
+        M.M_C = M_C;
+        // instantiated module
+        var M_M;
+        (function (M_M) {
+            var x;
+        })(M_M = M.M_M || (M.M_M = {}));
+        // function
+        function M_F() { }
+        M.M_F = M_F;
+        // enum
+        var M_E;
+        (function (M_E) {
+        })(M_E = M.M_E || (M.M_E = {}));
+        // alias
+        M.M_A = M_M;
+    })(M || (exports.M = M = {}));
+});
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt b/tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt
deleted file mode 100644
index 3e6978b3c6df0..0000000000000
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es5ModuleWithModuleGenAmd.ts (0 errors) ====
-    export class A
-    {
-        constructor ()
-        {
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-amd.errors.txt b/tests/baselines/reference/es6-amd.errors.txt
deleted file mode 100644
index 833994836117f..0000000000000
--- a/tests/baselines/reference/es6-amd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6-amd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-declaration-amd.errors.txt b/tests/baselines/reference/es6-declaration-amd.errors.txt
deleted file mode 100644
index 3692c46db4068..0000000000000
--- a/tests/baselines/reference/es6-declaration-amd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6-declaration-amd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-sourcemap-amd.errors.txt b/tests/baselines/reference/es6-sourcemap-amd.errors.txt
deleted file mode 100644
index 92d35757e0569..0000000000000
--- a/tests/baselines/reference/es6-sourcemap-amd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6-sourcemap-amd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-umd.errors.txt b/tests/baselines/reference/es6-umd.errors.txt
deleted file mode 100644
index a05e673c52789..0000000000000
--- a/tests/baselines/reference/es6-umd.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6-umd.ts (0 errors) ====
-    class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6-umd2.errors.txt b/tests/baselines/reference/es6-umd2.errors.txt
deleted file mode 100644
index ce0182d579719..0000000000000
--- a/tests/baselines/reference/es6-umd2.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6-umd2.ts (0 errors) ====
-    export class A
-    {
-        constructor ()
-        {
-    
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ExportAll.errors.txt b/tests/baselines/reference/es6ExportAll.errors.txt
deleted file mode 100644
index b4a0ac07bb257..0000000000000
--- a/tests/baselines/reference/es6ExportAll.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-client.ts(1,15): error TS2307: Cannot find module 'server' or its corresponding type declarations.
-
-
-==== server.ts (0 errors) ====
-    export class c {
-    }
-    export interface i {
-    }
-    export namespace m {
-        export var x = 10;
-    }
-    export var x = 10;
-    export namespace uninstantiated {
-    }
-    
-==== client.ts (1 errors) ====
-    export * from "server";
-                  ~~~~~~~~
-!!! error TS2307: Cannot find module 'server' or its corresponding type declarations.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ExportAssignment2.errors.txt b/tests/baselines/reference/es6ExportAssignment2.errors.txt
index 4a7c3f7332955..8edce04a105c1 100644
--- a/tests/baselines/reference/es6ExportAssignment2.errors.txt
+++ b/tests/baselines/reference/es6ExportAssignment2.errors.txt
@@ -8,5 +8,5 @@ a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScr
 !!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
     
 ==== b.ts (0 errors) ====
-    import * as a from "./a";
+    import * as a from "a";
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ExportAssignment2.js b/tests/baselines/reference/es6ExportAssignment2.js
index 85867d23e25fa..3278af118c0c9 100644
--- a/tests/baselines/reference/es6ExportAssignment2.js
+++ b/tests/baselines/reference/es6ExportAssignment2.js
@@ -5,7 +5,7 @@ var a = 10;
 export = a;  // Error: export = not allowed in ES6
 
 //// [b.ts]
-import * as a from "./a";
+import * as a from "a";
 
 
 //// [a.js]
diff --git a/tests/baselines/reference/es6ExportAssignment2.symbols b/tests/baselines/reference/es6ExportAssignment2.symbols
index ea19d84a18277..6fa64f1a1e93e 100644
--- a/tests/baselines/reference/es6ExportAssignment2.symbols
+++ b/tests/baselines/reference/es6ExportAssignment2.symbols
@@ -8,6 +8,6 @@ export = a;  // Error: export = not allowed in ES6
 >a : Symbol(a, Decl(a.ts, 0, 3))
 
 === b.ts ===
-import * as a from "./a";
+import * as a from "a";
 >a : Symbol(a, Decl(b.ts, 0, 6))
 
diff --git a/tests/baselines/reference/es6ExportAssignment2.types b/tests/baselines/reference/es6ExportAssignment2.types
index a7e3d69ea097a..f1549da945959 100644
--- a/tests/baselines/reference/es6ExportAssignment2.types
+++ b/tests/baselines/reference/es6ExportAssignment2.types
@@ -12,7 +12,7 @@ export = a;  // Error: export = not allowed in ES6
 >  : ^^^^^^
 
 === b.ts ===
-import * as a from "./a";
+import * as a from "a";
 >a : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/es6ExportAssignment3.errors.txt b/tests/baselines/reference/es6ExportAssignment3.errors.txt
deleted file mode 100644
index 9ae1143e42d99..0000000000000
--- a/tests/baselines/reference/es6ExportAssignment3.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-b.ts(1,20): error TS2307: Cannot find module 'a' or its corresponding type declarations.
-
-
-==== a.d.ts (0 errors) ====
-    declare var a: number;
-    export = a;  // OK, in ambient context
-    
-==== b.ts (1 errors) ====
-    import * as a from "a";
-                       ~~~
-!!! error TS2307: Cannot find module 'a' or its corresponding type declarations.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ExportAssignment3.types b/tests/baselines/reference/es6ExportAssignment3.types
index 8ce50d2cd7a78..f22df17b39120 100644
--- a/tests/baselines/reference/es6ExportAssignment3.types
+++ b/tests/baselines/reference/es6ExportAssignment3.types
@@ -11,6 +11,6 @@ export = a;  // OK, in ambient context
 
 === b.ts ===
 import * as a from "a";
->a : any
->  : ^^^
+>a : number
+>  : ^^^^^^
 
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
index b4e583a415ae2..5b97b10bc72f6 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
@@ -13,11 +13,11 @@ export namespace uninstantiated {
 }
 
 //// [client.ts]
-export { c } from "./server";
-export { c as c2 } from "./server";
-export { i, m as instantiatedModule } from "./server";
-export { uninstantiated } from "./server";
-export { x } from "./server";
+export { c } from "server";
+export { c as c2 } from "server";
+export { i, m as instantiatedModule } from "server";
+export { uninstantiated } from "server";
+export { x } from "server";
 
 //// [server.js]
 export class c {
@@ -28,10 +28,10 @@ export var m;
 })(m || (m = {}));
 export var x = 10;
 //// [client.js]
-export { c } from "./server";
-export { c as c2 } from "./server";
-export { m as instantiatedModule } from "./server";
-export { x } from "./server";
+export { c } from "server";
+export { c as c2 } from "server";
+export { m as instantiatedModule } from "server";
+export { x } from "server";
 
 
 //// [server.d.ts]
@@ -46,8 +46,8 @@ export declare var x: number;
 export declare namespace uninstantiated {
 }
 //// [client.d.ts]
-export { c } from "./server";
-export { c as c2 } from "./server";
-export { i, m as instantiatedModule } from "./server";
-export { uninstantiated } from "./server";
-export { x } from "./server";
+export { c } from "server";
+export { c as c2 } from "server";
+export { i, m as instantiatedModule } from "server";
+export { uninstantiated } from "server";
+export { x } from "server";
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols
index 5bb86fc8bb3fc..8138b7480650f 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols
@@ -21,21 +21,21 @@ export namespace uninstantiated {
 }
 
 === client.ts ===
-export { c } from "./server";
+export { c } from "server";
 >c : Symbol(c, Decl(client.ts, 0, 8))
 
-export { c as c2 } from "./server";
+export { c as c2 } from "server";
 >c : Symbol(c, Decl(server.ts, 0, 0))
 >c2 : Symbol(c2, Decl(client.ts, 1, 8))
 
-export { i, m as instantiatedModule } from "./server";
+export { i, m as instantiatedModule } from "server";
 >i : Symbol(i, Decl(client.ts, 2, 8))
 >m : Symbol(m, Decl(server.ts, 3, 1))
 >instantiatedModule : Symbol(instantiatedModule, Decl(client.ts, 2, 11))
 
-export { uninstantiated } from "./server";
+export { uninstantiated } from "server";
 >uninstantiated : Symbol(uninstantiated, Decl(client.ts, 3, 8))
 
-export { x } from "./server";
+export { x } from "server";
 >x : Symbol(x, Decl(client.ts, 4, 8))
 
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
index a710edd26559f..780c37727aa5c 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
@@ -27,17 +27,17 @@ export namespace uninstantiated {
 }
 
 === client.ts ===
-export { c } from "./server";
+export { c } from "server";
 >c : typeof import("server").c
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-export { c as c2 } from "./server";
+export { c as c2 } from "server";
 >c : typeof import("server").c
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >c2 : typeof import("server").c
 >   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-export { i, m as instantiatedModule } from "./server";
+export { i, m as instantiatedModule } from "server";
 >i : any
 >  : ^^^
 >m : typeof import("server").m
@@ -45,11 +45,11 @@ export { i, m as instantiatedModule } from "./server";
 >instantiatedModule : typeof import("server").m
 >                   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-export { uninstantiated } from "./server";
+export { uninstantiated } from "server";
 >uninstantiated : any
 >               : ^^^
 
-export { x } from "./server";
+export { x } from "server";
 >x : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 008fe6780b146..5de9c59808b50 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -220,28 +220,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -266,15 +244,15 @@ z7.a;
 z8.a;
 z9.a;
 z0.a;
-var y2 = __importStar(require("variable"));
-var y3 = __importStar(require("interface-variable"));
-var y4 = __importStar(require("module"));
-var y5 = __importStar(require("interface-module"));
-var y6 = __importStar(require("variable-module"));
-var y7 = __importStar(require("function"));
-var y8 = __importStar(require("function-module"));
-var y9 = __importStar(require("class"));
-var y0 = __importStar(require("class-module"));
+var y2 = require("variable");
+var y3 = require("interface-variable");
+var y4 = require("module");
+var y5 = require("interface-module");
+var y6 = require("variable-module");
+var y7 = require("function");
+var y8 = require("function-module");
+var y9 = require("class");
+var y0 = require("class-module");
 y1.a;
 y2.a;
 y3.a;
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.types b/tests/baselines/reference/es6ExportEqualsInterop.types
index 7641b2fa06616..50d106803f9cb 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.types
+++ b/tests/baselines/reference/es6ExportEqualsInterop.types
@@ -195,7 +195,7 @@ import * as y7 from "function";
 >   : ^^^^^^^^^
 
 import * as y8 from "function-module";
->y8 : typeof y8
+>y8 : typeof z8
 >   : ^^^^^^^^^
 
 import * as y9 from "class";
@@ -203,7 +203,7 @@ import * as y9 from "class";
 >   : ^^^^^^^^^
 
 import * as y0 from "class-module";
->y0 : typeof y0
+>y0 : typeof z0
 >   : ^^^^^^^^^
 
 y1.a;
@@ -265,7 +265,7 @@ y7.a;
 y8.a;
 >y8.a : number
 >     : ^^^^^^
->y8 : typeof y8
+>y8 : typeof z8
 >   : ^^^^^^^^^
 >a : number
 >  : ^^^^^^
@@ -281,7 +281,7 @@ y9.a;
 y0.a;
 >y0.a : number
 >     : ^^^^^^
->y0 : typeof y0
+>y0 : typeof z0
 >   : ^^^^^^^^^
 >a : number
 >  : ^^^^^^
diff --git a/tests/baselines/reference/es6ImportDefaultBinding.js b/tests/baselines/reference/es6ImportDefaultBinding.js
index 4dc135ea4813b..bdc9b4b846317 100644
--- a/tests/baselines/reference/es6ImportDefaultBinding.js
+++ b/tests/baselines/reference/es6ImportDefaultBinding.js
@@ -5,16 +5,16 @@ var a = 10;
 export default a;
 
 //// [es6ImportDefaultBinding_1.ts]
-import defaultBinding from "./es6ImportDefaultBinding_0";
+import defaultBinding from "es6ImportDefaultBinding_0";
 var x = defaultBinding;
-import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
 
 
 //// [es6ImportDefaultBinding_0.js]
 var a = 10;
 export default a;
 //// [es6ImportDefaultBinding_1.js]
-import defaultBinding from "./es6ImportDefaultBinding_0";
+import defaultBinding from "es6ImportDefaultBinding_0";
 var x = defaultBinding;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBinding.symbols b/tests/baselines/reference/es6ImportDefaultBinding.symbols
index 1b8360a6dda7a..a5b73019ad37d 100644
--- a/tests/baselines/reference/es6ImportDefaultBinding.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBinding.symbols
@@ -8,13 +8,13 @@ export default a;
 >a : Symbol(a, Decl(es6ImportDefaultBinding_0.ts, 0, 3))
 
 === es6ImportDefaultBinding_1.ts ===
-import defaultBinding from "./es6ImportDefaultBinding_0";
+import defaultBinding from "es6ImportDefaultBinding_0";
 >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBinding_1.ts, 0, 6))
 
 var x = defaultBinding;
 >x : Symbol(x, Decl(es6ImportDefaultBinding_1.ts, 1, 3))
 >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBinding_1.ts, 0, 6))
 
-import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
 >defaultBinding2 : Symbol(defaultBinding2, Decl(es6ImportDefaultBinding_1.ts, 2, 6))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBinding.types b/tests/baselines/reference/es6ImportDefaultBinding.types
index d93a534da3580..7259ff29b1dba 100644
--- a/tests/baselines/reference/es6ImportDefaultBinding.types
+++ b/tests/baselines/reference/es6ImportDefaultBinding.types
@@ -12,7 +12,7 @@ export default a;
 >  : ^^^^^^
 
 === es6ImportDefaultBinding_1.ts ===
-import defaultBinding from "./es6ImportDefaultBinding_0";
+import defaultBinding from "es6ImportDefaultBinding_0";
 >defaultBinding : number
 >               : ^^^^^^
 
@@ -22,7 +22,7 @@ var x = defaultBinding;
 >defaultBinding : number
 >               : ^^^^^^
 
-import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
 >defaultBinding2 : number
 >                : ^^^^^^
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingAmd.errors.txt
deleted file mode 100644
index 9ccf2ad6667b6..0000000000000
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6ImportDefaultBindingAmd_0.ts (0 errors) ====
-    var a = 10;
-    export default a;
-    
-==== es6ImportDefaultBindingAmd_1.ts (0 errors) ====
-    import defaultBinding from "es6ImportDefaultBindingAmd_0";
-    var x = defaultBinding;
-    import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import since defaultBinding2 is not used
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index ac5fbfe777f27..1f6b3c97c8fe3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -18,13 +18,9 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [es6ImportDefaultBindingAmd_1.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    es6ImportDefaultBindingAmd_0_1 = __importDefault(es6ImportDefaultBindingAmd_0_1);
     var x = es6ImportDefaultBindingAmd_0_1.default;
 });
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index ca23970b5ee8d..7a5fd36865001 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -21,12 +21,9 @@ var c = /** @class */ (function () {
 exports.default = c;
 //// [client.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
-var server_1 = __importDefault(require("./server"));
+var server_1 = require("./server");
 exports.x = new server_1.default();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt
index a581c4deaca0e..b097a3089c190 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt
@@ -1,9 +1,9 @@
-es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,30): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,30): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
 
 
 ==== es6ImportDefaultBindingFollowedWithNamedImport1_0.ts (0 errors) ====
@@ -11,28 +11,28 @@ es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Modul
     export default a;
     
 ==== es6ImportDefaultBindingFollowedWithNamedImport1_1.ts (6 errors) ====
-    import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+    import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
     var x1: number = defaultBinding1;
-    import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+    import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding2;
-    import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+    import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding3;
-    import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+    import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
                                  ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding4;
-    import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+    import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding5;
-    import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+    import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding6;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js
index 985f695b6c058..31194c308ba6b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js
@@ -5,17 +5,17 @@ var a = 10;
 export default a;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1_1.ts]
-import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding1;
-import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding2;
-import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding3;
-import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding4;
-import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding5;
-import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding6;
 
 
@@ -23,17 +23,17 @@ var x1: number = defaultBinding6;
 var a = 10;
 export default a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1_1.js]
-import defaultBinding1 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding1 from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1 = defaultBinding1;
-import defaultBinding2 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding2 from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1 = defaultBinding2;
-import defaultBinding3 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding3 from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1 = defaultBinding3;
-import defaultBinding4 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding4 from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1 = defaultBinding4;
-import defaultBinding5 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding5 from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1 = defaultBinding5;
-import defaultBinding6 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding6 from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1 = defaultBinding6;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols
index db2926e1025e1..efe22435de905 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols
@@ -8,14 +8,14 @@ export default a;
 >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_0.ts, 0, 3))
 
 === es6ImportDefaultBindingFollowedWithNamedImport1_1.ts ===
-import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding1 : Symbol(defaultBinding1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 0, 6))
 
 var x1: number = defaultBinding1;
 >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more)
 >defaultBinding1 : Symbol(defaultBinding1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 0, 6))
 
-import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding2 : Symbol(defaultBinding2, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 2, 6))
 >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 2, 25))
 
@@ -23,7 +23,7 @@ var x1: number = defaultBinding2;
 >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more)
 >defaultBinding2 : Symbol(defaultBinding2, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 2, 6))
 
-import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 6))
 >b : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 25))
 
@@ -31,7 +31,7 @@ var x1: number = defaultBinding3;
 >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more)
 >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 6))
 
-import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 6))
 >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 25))
 >y : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 28))
@@ -40,7 +40,7 @@ var x1: number = defaultBinding4;
 >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more)
 >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 6))
 
-import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 6))
 >z : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 25))
 
@@ -48,7 +48,7 @@ var x1: number = defaultBinding5;
 >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more)
 >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 6))
 
-import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding6 : Symbol(defaultBinding6, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 10, 6))
 >m : Symbol(m, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 10, 25))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.types
index 593b3904a3943..cc848577ff58d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.types
@@ -12,7 +12,7 @@ export default a;
 >  : ^^^^^^
 
 === es6ImportDefaultBindingFollowedWithNamedImport1_1.ts ===
-import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding1 : number
 >                : ^^^^^^
 
@@ -22,7 +22,7 @@ var x1: number = defaultBinding1;
 >defaultBinding1 : number
 >                : ^^^^^^
 
-import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding2 : number
 >                : ^^^^^^
 >a : any
@@ -34,7 +34,7 @@ var x1: number = defaultBinding2;
 >defaultBinding2 : number
 >                : ^^^^^^
 
-import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding3 : number
 >                : ^^^^^^
 >a : any
@@ -48,7 +48,7 @@ var x1: number = defaultBinding3;
 >defaultBinding3 : number
 >                : ^^^^^^
 
-import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding4 : number
 >                : ^^^^^^
 >x : any
@@ -64,7 +64,7 @@ var x1: number = defaultBinding4;
 >defaultBinding4 : number
 >                : ^^^^^^
 
-import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding5 : number
 >                : ^^^^^^
 >x : any
@@ -78,7 +78,7 @@ var x1: number = defaultBinding5;
 >defaultBinding5 : number
 >                : ^^^^^^
 
-import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 >defaultBinding6 : number
 >                : ^^^^^^
 >m : any
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index 05173fc4ac6bb..ef9ab7215bc85 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -26,21 +26,18 @@ var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 59dbbcf9d1766..4df23abf73416 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -26,22 +26,19 @@ var a = 10;
 exports.default = a;
 //// [client.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x1 = void 0;
-var server_1 = __importDefault(require("./server"));
+var server_1 = require("./server");
 exports.x1 = server_1.default;
-var server_2 = __importDefault(require("./server"));
+var server_2 = require("./server");
 exports.x1 = server_2.default;
-var server_3 = __importDefault(require("./server"));
+var server_3 = require("./server");
 exports.x1 = server_3.default;
-var server_4 = __importDefault(require("./server"));
+var server_4 = require("./server");
 exports.x1 = server_4.default;
-var server_5 = __importDefault(require("./server"));
+var server_5 = require("./server");
 exports.x1 = server_5.default;
-var server_6 = __importDefault(require("./server"));
+var server_6 = require("./server");
 exports.x1 = server_6.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index a782de2a5003e..66dfd460f7f3a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -29,22 +29,19 @@ var a = /** @class */ (function () {
 exports.default = a;
 //// [client.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x6 = exports.x5 = exports.x4 = exports.x3 = exports.x2 = exports.x1 = void 0;
-var server_1 = __importDefault(require("./server"));
+var server_1 = require("./server");
 exports.x1 = new server_1.default();
-var server_2 = __importDefault(require("./server"));
+var server_2 = require("./server");
 exports.x2 = new server_2.default();
-var server_3 = __importDefault(require("./server"));
+var server_3 = require("./server");
 exports.x3 = new server_3.default();
-var server_4 = __importDefault(require("./server"));
+var server_4 = require("./server");
 exports.x4 = new server_4.default();
-var server_5 = __importDefault(require("./server"));
+var server_5 = require("./server");
 exports.x5 = new server_5.default();
-var server_6 = __importDefault(require("./server"));
+var server_6 = require("./server");
 exports.x6 = new server_6.default();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt
index 08261f24e767f..6e6ad7a586eac 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt
@@ -19,22 +19,22 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     export default {};
     
 ==== client.ts (12 errors) ====
-    export import defaultBinding1, { } from "./server";
+    export import defaultBinding1, { } from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
-    export import defaultBinding2, { a } from "./server";
+    export import defaultBinding2, { a } from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x1: number = a;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
-    export import defaultBinding3, { a as b } from "./server";
+    export import defaultBinding3, { a as b } from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x1: number = b;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
-    export import defaultBinding4, { x, a as y } from "./server";
+    export import defaultBinding4, { x, a as y } from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x1: number = x;
@@ -43,13 +43,13 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     export var x1: number = y;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
-    export import defaultBinding5, { x as z,  } from "./server";
+    export import defaultBinding5, { x as z,  } from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x1: number = z;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
-    export import defaultBinding6, { m,  } from "./server";
+    export import defaultBinding6, { m,  } from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x1: number = m;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index dd9775e4ddef3..e2bd0c2d125ac 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -7,43 +7,42 @@ export var m = a;
 export default {};
 
 //// [client.ts]
-export import defaultBinding1, { } from "./server";
-export import defaultBinding2, { a } from "./server";
+export import defaultBinding1, { } from "server";
+export import defaultBinding2, { a } from "server";
 export var x1: number = a;
-export import defaultBinding3, { a as b } from "./server";
+export import defaultBinding3, { a as b } from "server";
 export var x1: number = b;
-export import defaultBinding4, { x, a as y } from "./server";
+export import defaultBinding4, { x, a as y } from "server";
 export var x1: number = x;
 export var x1: number = y;
-export import defaultBinding5, { x as z,  } from "./server";
+export import defaultBinding5, { x as z,  } from "server";
 export var x1: number = z;
-export import defaultBinding6, { m,  } from "./server";
+export import defaultBinding6, { m,  } from "server";
 export var x1: number = m;
 
 
 //// [server.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.m = exports.x = exports.a = void 0;
-exports.a = 10;
-exports.x = exports.a;
-exports.m = exports.a;
-exports.default = {};
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.m = exports.x = exports.a = void 0;
+    exports.a = 10;
+    exports.x = exports.a;
+    exports.m = exports.a;
+    exports.default = {};
+});
 //// [client.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.x1 = void 0;
-var server_1 = require("./server");
-exports.x1 = server_1.a;
-var server_2 = require("./server");
-exports.x1 = server_2.a;
-var server_3 = require("./server");
-exports.x1 = server_3.x;
-exports.x1 = server_3.a;
-var server_4 = require("./server");
-exports.x1 = server_4.x;
-var server_5 = require("./server");
-exports.x1 = server_5.m;
+define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x1 = void 0;
+    exports.x1 = server_1.a;
+    exports.x1 = server_2.a;
+    exports.x1 = server_3.x;
+    exports.x1 = server_3.a;
+    exports.x1 = server_4.x;
+    exports.x1 = server_5.m;
+});
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols
index 35bbfb8c42413..3fc028cb7a670 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols
@@ -15,10 +15,10 @@ export var m = a;
 export default {};
 
 === client.ts ===
-export import defaultBinding1, { } from "./server";
+export import defaultBinding1, { } from "server";
 >defaultBinding1 : Symbol(defaultBinding1, Decl(client.ts, 0, 13))
 
-export import defaultBinding2, { a } from "./server";
+export import defaultBinding2, { a } from "server";
 >defaultBinding2 : Symbol(defaultBinding2, Decl(client.ts, 1, 13))
 >a : Symbol(a, Decl(client.ts, 1, 32))
 
@@ -26,7 +26,7 @@ export var x1: number = a;
 >x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more)
 >a : Symbol(a, Decl(client.ts, 1, 32))
 
-export import defaultBinding3, { a as b } from "./server";
+export import defaultBinding3, { a as b } from "server";
 >defaultBinding3 : Symbol(defaultBinding3, Decl(client.ts, 3, 13))
 >a : Symbol(a, Decl(server.ts, 0, 10))
 >b : Symbol(b, Decl(client.ts, 3, 32))
@@ -35,7 +35,7 @@ export var x1: number = b;
 >x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more)
 >b : Symbol(b, Decl(client.ts, 3, 32))
 
-export import defaultBinding4, { x, a as y } from "./server";
+export import defaultBinding4, { x, a as y } from "server";
 >defaultBinding4 : Symbol(defaultBinding4, Decl(client.ts, 5, 13))
 >x : Symbol(x, Decl(client.ts, 5, 32))
 >a : Symbol(a, Decl(server.ts, 0, 10))
@@ -49,7 +49,7 @@ export var x1: number = y;
 >x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more)
 >y : Symbol(y, Decl(client.ts, 5, 35))
 
-export import defaultBinding5, { x as z,  } from "./server";
+export import defaultBinding5, { x as z,  } from "server";
 >defaultBinding5 : Symbol(defaultBinding5, Decl(client.ts, 8, 13))
 >x : Symbol(x, Decl(server.ts, 1, 10))
 >z : Symbol(z, Decl(client.ts, 8, 32))
@@ -58,7 +58,7 @@ export var x1: number = z;
 >x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more)
 >z : Symbol(z, Decl(client.ts, 8, 32))
 
-export import defaultBinding6, { m,  } from "./server";
+export import defaultBinding6, { m,  } from "server";
 >defaultBinding6 : Symbol(defaultBinding6, Decl(client.ts, 10, 13))
 >m : Symbol(m, Decl(client.ts, 10, 32))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types
index cfac0a86f6d93..69f14f12e1599 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types
@@ -24,11 +24,11 @@ export default {};
 >   : ^^
 
 === client.ts ===
-export import defaultBinding1, { } from "./server";
+export import defaultBinding1, { } from "server";
 >defaultBinding1 : {}
 >                : ^^
 
-export import defaultBinding2, { a } from "./server";
+export import defaultBinding2, { a } from "server";
 >defaultBinding2 : {}
 >                : ^^
 >a : number
@@ -40,7 +40,7 @@ export var x1: number = a;
 >a : number
 >  : ^^^^^^
 
-export import defaultBinding3, { a as b } from "./server";
+export import defaultBinding3, { a as b } from "server";
 >defaultBinding3 : {}
 >                : ^^
 >a : number
@@ -54,7 +54,7 @@ export var x1: number = b;
 >b : number
 >  : ^^^^^^
 
-export import defaultBinding4, { x, a as y } from "./server";
+export import defaultBinding4, { x, a as y } from "server";
 >defaultBinding4 : {}
 >                : ^^
 >x : number
@@ -76,7 +76,7 @@ export var x1: number = y;
 >y : number
 >  : ^^^^^^
 
-export import defaultBinding5, { x as z,  } from "./server";
+export import defaultBinding5, { x as z,  } from "server";
 >defaultBinding5 : {}
 >                : ^^
 >x : number
@@ -90,7 +90,7 @@ export var x1: number = z;
 >z : number
 >  : ^^^^^^
 
-export import defaultBinding6, { m,  } from "./server";
+export import defaultBinding6, { m,  } from "server";
 >defaultBinding6 : {}
 >                : ^^
 >m : number
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
index 446b5e271d756..2a8a666ba905b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
@@ -5,7 +5,7 @@ es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,8): error TS1192: Mod
     export var a = 10;
     
 ==== es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts (1 errors) ====
-    import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+    import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
            ~~~~~~~~~~~~~~
 !!! error TS1192: Module '"es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export.
     var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
index e38fa303c6bfe..2c86e06263511 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
@@ -4,13 +4,13 @@
 export var a = 10;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts]
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js]
 export var a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js]
-import * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols
index f2686bc37c962..f6c055019ee63 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols
@@ -5,7 +5,7 @@ export var a = 10;
 >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 10))
 
 === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts ===
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 6))
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 22))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.types
index ee79a876e577a..37df16e07fe3b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.types
@@ -8,7 +8,7 @@ export var a = 10;
 >   : ^^
 
 === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts ===
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 >defaultBinding : any
 >               : ^^^
 >nameSpaceBinding : typeof nameSpaceBinding
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js
index bd12489fc9d52..039b4a3dce8a5 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js
@@ -5,14 +5,14 @@ var a = 10;
 export default a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts]
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js]
 var a = 10;
 export default a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js]
-import defaultBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x = defaultBinding;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols
index 700ee31c46dea..b8cac73d9a6f4 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols
@@ -8,7 +8,7 @@ export default a;
 >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 3))
 
 === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts ===
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 6))
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 22))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types
index e41841cb0900f..e96874529a3eb 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types
@@ -12,7 +12,7 @@ export default a;
 >  : ^^^^^^
 
 === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts ===
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 >defaultBinding : number
 >               : ^^^^^^
 >nameSpaceBinding : typeof nameSpaceBinding
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 886110501474e..9183663850bcc 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -15,11 +15,8 @@ var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"));
+var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt
index 2c71ce2555eb4..c4e493e1c80c8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt
@@ -1,14 +1,12 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 client.ts(1,1): error TS1191: An import declaration cannot have modifiers.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== server.ts (0 errors) ====
     var a = 10;
     export default a;
     
 ==== client.ts (1 errors) ====
-    export import defaultBinding, * as nameSpaceBinding  from "./server";
+    export import defaultBinding, * as nameSpaceBinding  from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x: number = defaultBinding;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index 816d4b5fb898d..8bed6e890bfe1 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -5,7 +5,7 @@ var a = 10;
 export default a;
 
 //// [client.ts]
-export import defaultBinding, * as nameSpaceBinding  from "./server";
+export import defaultBinding, * as nameSpaceBinding  from "server";
 export var x: number = defaultBinding;
 
 //// [server.js]
@@ -16,14 +16,10 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-define(["require", "exports", "./server"], function (require, exports, server_1) {
+define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
-    server_1 = __importDefault(server_1);
     exports.x = server_1.default;
 });
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.symbols
index 42acdc7dd56b0..b8ed20c120288 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.symbols
@@ -8,7 +8,7 @@ export default a;
 >a : Symbol(a, Decl(server.ts, 0, 3))
 
 === client.ts ===
-export import defaultBinding, * as nameSpaceBinding  from "./server";
+export import defaultBinding, * as nameSpaceBinding  from "server";
 >defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 13))
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(client.ts, 0, 29))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.types
index 580e9301d1434..5cc82390e35da 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.types
@@ -12,7 +12,7 @@ export default a;
 >  : ^^^^^^
 
 === client.ts ===
-export import defaultBinding, * as nameSpaceBinding  from "./server";
+export import defaultBinding, * as nameSpaceBinding  from "server";
 >defaultBinding : number
 >               : ^^^^^^
 >nameSpaceBinding : typeof nameSpaceBinding
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 732d45d6dabb8..f7f1cf19becdc 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -19,42 +19,9 @@ var a = /** @class */ (function () {
 exports.a = a;
 //// [client.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
-var nameSpaceBinding = __importStar(require("./server"));
+var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt
deleted file mode 100644
index 273d72455a1ac..0000000000000
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== server.ts (0 errors) ====
-    class a { }
-    export default a;
-    
-==== client.ts (0 errors) ====
-    import defaultBinding, * as nameSpaceBinding from "./server";
-    export var x = new defaultBinding();
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index e87c1cd5c387d..0fc11b79a2089 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -5,7 +5,7 @@ class a { }
 export default a;
 
 //// [client.ts]
-import defaultBinding, * as nameSpaceBinding from "./server";
+import defaultBinding, * as nameSpaceBinding from "server";
 export var x = new defaultBinding();
 
 //// [server.js]
@@ -20,14 +20,10 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-define(["require", "exports", "./server"], function (require, exports, server_1) {
+define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
-    server_1 = __importDefault(server_1);
     exports.x = new server_1.default();
 });
 
@@ -37,5 +33,5 @@ declare class a {
 }
 export default a;
 //// [client.d.ts]
-import defaultBinding from "./server";
+import defaultBinding from "server";
 export declare var x: defaultBinding;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.symbols
index 6227c06b0ee62..d4830a8bb4814 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.symbols
@@ -8,7 +8,7 @@ export default a;
 >a : Symbol(a, Decl(server.ts, 0, 0))
 
 === client.ts ===
-import defaultBinding, * as nameSpaceBinding from "./server";
+import defaultBinding, * as nameSpaceBinding from "server";
 >defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 6))
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(client.ts, 0, 22))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.types
index 0a5070ab4ec70..14af14a2ff542 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.types
@@ -10,7 +10,7 @@ export default a;
 >  : ^
 
 === client.ts ===
-import defaultBinding, * as nameSpaceBinding from "./server";
+import defaultBinding, * as nameSpaceBinding from "server";
 >defaultBinding : typeof defaultBinding
 >               : ^^^^^^^^^^^^^^^^^^^^^
 >nameSpaceBinding : typeof nameSpaceBinding
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 595059eac3e18..948c502babe98 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -14,41 +14,8 @@ exports.a = void 0;
 exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var nameSpaceBinding = __importStar(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"));
+var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index 3d4c46495939f..51fe84eec1f70 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -14,42 +14,9 @@ exports.a = void 0;
 exports.a = 10;
 //// [client.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
-var nameSpaceBinding = __importStar(require("./server"));
+var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index 235056af327ef..85f3d34cd6781 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -22,10 +22,7 @@ var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var es6ImportDefaultBindingMergeErrors_0_1 = __importDefault(require("./es6ImportDefaultBindingMergeErrors_0"));
+var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingWithExport.errors.txt
index de33de8cdad2c..467c76ca83a13 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.errors.txt
@@ -7,10 +7,10 @@ client.ts(3,1): error TS1191: An import declaration cannot have modifiers.
     export default a;
     
 ==== client.ts (2 errors) ====
-    export import defaultBinding from "./server";
+    export import defaultBinding from "server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x = defaultBinding;
-    export import defaultBinding2 from "./server"; // non referenced
+    export import defaultBinding2 from "server"; // non referenced
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index 749e4ef07b717..b50f0622b125d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -5,24 +5,24 @@ var a = 10;
 export default a;
 
 //// [client.ts]
-export import defaultBinding from "./server";
+export import defaultBinding from "server";
 export var x = defaultBinding;
-export import defaultBinding2 from "./server"; // non referenced
+export import defaultBinding2 from "server"; // non referenced
 
 //// [server.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var a = 10;
-exports.default = a;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = 10;
+    exports.default = a;
+});
 //// [client.js]
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.x = void 0;
-var server_1 = __importDefault(require("./server"));
-exports.x = server_1.default;
+define(["require", "exports", "server"], function (require, exports, server_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = server_1.default;
+});
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingWithExport.symbols
index 6090e8d56e169..1801c44853d97 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.symbols
@@ -8,13 +8,13 @@ export default a;
 >a : Symbol(a, Decl(server.ts, 0, 3))
 
 === client.ts ===
-export import defaultBinding from "./server";
+export import defaultBinding from "server";
 >defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 13))
 
 export var x = defaultBinding;
 >x : Symbol(x, Decl(client.ts, 1, 10))
 >defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 13))
 
-export import defaultBinding2 from "./server"; // non referenced
+export import defaultBinding2 from "server"; // non referenced
 >defaultBinding2 : Symbol(defaultBinding2, Decl(client.ts, 2, 13))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.types b/tests/baselines/reference/es6ImportDefaultBindingWithExport.types
index 5d4a3cab7045c..10f078e6b451b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.types
@@ -12,7 +12,7 @@ export default a;
 >  : ^^^^^^
 
 === client.ts ===
-export import defaultBinding from "./server";
+export import defaultBinding from "server";
 >defaultBinding : number
 >               : ^^^^^^
 
@@ -22,7 +22,7 @@ export var x = defaultBinding;
 >defaultBinding : number
 >               : ^^^^^^
 
-export import defaultBinding2 from "./server"; // non referenced
+export import defaultBinding2 from "server"; // non referenced
 >defaultBinding2 : number
 >                : ^^^^^^
 
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt b/tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
index fec1b354af493..ee2508c95b4d1 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
@@ -3,8 +3,8 @@ server.ts(2,1): error TS1203: Export assignment cannot be used when targeting EC
 
 
 ==== client.ts (1 errors) ====
-    import a = require("./server");
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    import a = require("server");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
 ==== server.ts (1 errors) ====
     var a = 10;
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration.js b/tests/baselines/reference/es6ImportEqualsDeclaration.js
index b994bd728a7db..506c22a351e93 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration.js
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration.js
@@ -5,7 +5,7 @@ var a = 10;
 export = a;
 
 //// [client.ts]
-import a = require("./server");
+import a = require("server");
 
 //// [server.js]
 var a = 10;
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration.symbols b/tests/baselines/reference/es6ImportEqualsDeclaration.symbols
index fc301a740c4cc..ad1c83d5aae0a 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration.symbols
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration.symbols
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/es6ImportEqualsDeclaration.ts] ////
 
 === client.ts ===
-import a = require("./server");
+import a = require("server");
 >a : Symbol(a, Decl(client.ts, 0, 0))
 
 === server.ts ===
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration.types b/tests/baselines/reference/es6ImportEqualsDeclaration.types
index cee3906a8961b..8a66b5d3097aa 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration.types
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/es6ImportEqualsDeclaration.ts] ////
 
 === client.ts ===
-import a = require("./server");
+import a = require("server");
 >a : number
 >  : ^^^^^^
 
diff --git a/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js b/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js
index 1c8ad9adf9cb9..7361b1b144cea 100644
--- a/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js
+++ b/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js
@@ -21,39 +21,6 @@ var a = /** @class */ (function () {
 module.exports = a;
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a = __importStar(require("./a"));
+var a = require("./a");
 a;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 1f01c654c800d..ce72655687e2a 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -16,41 +16,8 @@ exports.a = void 0;
 exports.a = 10;
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImport_0"));
+const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt
deleted file mode 100644
index 7b0a5f46c0724..0000000000000
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6ImportNameSpaceImportAmd_0.ts (0 errors) ====
-    export var a = 10;
-    
-==== es6ImportNameSpaceImportAmd_1.ts (0 errors) ====
-    import * as nameSpaceBinding from "es6ImportNameSpaceImportAmd_0";
-    var x = nameSpaceBinding.a;
-    import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide this
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index 50ec2cdc2db7f..a9e632894a005 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -17,43 +17,9 @@ define(["require", "exports"], function (require, exports) {
     exports.a = 10;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    nameSpaceBinding = __importStar(nameSpaceBinding);
     var x = nameSpaceBinding.a;
 });
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 7564746d5a327..c77b5269ca132 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -21,42 +21,9 @@ exports.c = c;
 ;
 //// [client.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
-var nameSpaceBinding = __importStar(require("./server"));
+var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index b745b4042fa89..d3a53e2c8705f 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -16,41 +16,8 @@ exports.a = void 0;
 exports.a = 10;
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImportInEs5_0"));
+var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt
index fabe4072ec1b0..48bef0dde35ea 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 client.ts(1,1): error TS1191: An import declaration cannot have modifiers.
 client.ts(3,1): error TS1191: An import declaration cannot have modifiers.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== server.ts (0 errors) ====
     export var a = 10;
     
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index 17b6a131ea274..79399f3111bd9 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -17,44 +17,10 @@ define(["require", "exports"], function (require, exports) {
     exports.a = 10;
 });
 //// [client.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
-    nameSpaceBinding = __importStar(nameSpaceBinding);
     exports.x = nameSpaceBinding.a;
 });
 
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.errors.txt b/tests/baselines/reference/es6ImportNamedImportAmd.errors.txt
deleted file mode 100644
index dd45c162b6406..0000000000000
--- a/tests/baselines/reference/es6ImportNamedImportAmd.errors.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6ImportNamedImportAmd_0.ts (0 errors) ====
-    export var a = 10;
-    export var x = a;
-    export var m = a;
-    export var a1 = 10;
-    export var x1 = 10;
-    export var z1 = 10;
-    export var z2 = 10;
-    export var aaaa = 10;
-    
-==== es6ImportNamedImportAmd_1.ts (0 errors) ====
-    import { } from "es6ImportNamedImportAmd_0";
-    import { a } from "es6ImportNamedImportAmd_0";
-    var xxxx = a;
-    import { a as b } from "es6ImportNamedImportAmd_0";
-    var xxxx = b;
-    import { x, a as y } from "es6ImportNamedImportAmd_0";
-    var xxxx = x;
-    var xxxx = y;
-    import { x as z,  } from "es6ImportNamedImportAmd_0";
-    var xxxx = z;
-    import { m,  } from "es6ImportNamedImportAmd_0";
-    var xxxx = m;
-    import { a1, x1 } from "es6ImportNamedImportAmd_0";
-    var xxxx = a1;
-    var xxxx = x1;
-    import { a1 as a11, x1 as x11 } from "es6ImportNamedImportAmd_0";
-    var xxxx = a11;
-    var xxxx = x11;
-    import { z1 } from "es6ImportNamedImportAmd_0";
-    var z111 = z1;
-    import { z2 as z3 } from "es6ImportNamedImportAmd_0";
-    var z2 = z3; // z2 shouldn't give redeclare error
-    
-    // These are elided
-    import { aaaa } from "es6ImportNamedImportAmd_0";
-    // These are elided
-    import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt
index 9d62c047bc46c..e8c9ac41c4ad4 100644
--- a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt
@@ -1,16 +1,16 @@
 es6ImportNamedImportIdentifiersParsing.ts(1,10): error TS2300: Duplicate identifier 'yield'.
-es6ImportNamedImportIdentifiersParsing.ts(1,23): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+es6ImportNamedImportIdentifiersParsing.ts(1,23): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS1003: Identifier expected.
 es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS2300: Duplicate identifier 'default'.
-es6ImportNamedImportIdentifiersParsing.ts(2,25): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+es6ImportNamedImportIdentifiersParsing.ts(2,25): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 es6ImportNamedImportIdentifiersParsing.ts(3,19): error TS1003: Identifier expected.
 es6ImportNamedImportIdentifiersParsing.ts(3,19): error TS2300: Duplicate identifier 'default'.
-es6ImportNamedImportIdentifiersParsing.ts(3,34): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+es6ImportNamedImportIdentifiersParsing.ts(3,34): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 es6ImportNamedImportIdentifiersParsing.ts(4,21): error TS2300: Duplicate identifier 'yield'.
-es6ImportNamedImportIdentifiersParsing.ts(4,34): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+es6ImportNamedImportIdentifiersParsing.ts(4,34): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS1003: Identifier expected.
 es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS2300: Duplicate identifier 'default'.
-es6ImportNamedImportIdentifiersParsing.ts(5,36): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+es6ImportNamedImportIdentifiersParsing.ts(5,36): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== es6ImportNamedImportIdentifiersParsing.ts (13 errors) ====
@@ -18,30 +18,30 @@ es6ImportNamedImportIdentifiersParsing.ts(5,36): error TS2307: Cannot find modul
              ~~~~~
 !!! error TS2300: Duplicate identifier 'yield'.
                           ~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     import { default } from "somemodule"; // Error - as this is keyword that is not allowed as identifier
              ~~~~~~~
 !!! error TS1003: Identifier expected.
              ~~~~~~~
 !!! error TS2300: Duplicate identifier 'default'.
                             ~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     import { yield as default } from "somemodule"; // error to use default as binding name
                       ~~~~~~~
 !!! error TS1003: Identifier expected.
                       ~~~~~~~
 !!! error TS2300: Duplicate identifier 'default'.
                                      ~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     import { default as yield } from "somemodule"; // no error 
                         ~~~~~
 !!! error TS2300: Duplicate identifier 'yield'.
                                      ~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     import { default as default } from "somemodule"; // default as is ok, error of default binding name
                         ~~~~~~~
 !!! error TS1003: Identifier expected.
                         ~~~~~~~
 !!! error TS2300: Duplicate identifier 'default'.
                                        ~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
\ No newline at end of file
+!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
index da972d070ea8b..480948746cd85 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
@@ -1,5 +1,5 @@
-es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import.
-es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import.
+es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
+es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
 
 
 ==== es6ImportNamedImportNoNamedExports_0.ts (0 errors) ====
@@ -9,7 +9,7 @@ es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2616: 'a' can only be imp
 ==== es6ImportNamedImportNoNamedExports_1.ts (2 errors) ====
     import { a } from "./es6ImportNamedImportNoNamedExports_0";
              ~
-!!! error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import.
+!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
     import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
              ~
-!!! error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import.
\ No newline at end of file
+!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt b/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
index 330a18d8df4d7..520bcea042994 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
@@ -20,7 +20,7 @@ es6ImportNamedImportParsingError_1.ts(4,20): error TS1005: ';' expected.
     export var m = a;
     
 ==== es6ImportNamedImportParsingError_1.ts (14 errors) ====
-    import { * } from "./es6ImportNamedImportParsingError_0";
+    import { * } from "es6ImportNamedImportParsingError_0";
              ~
 !!! error TS1003: Identifier expected.
              ~
@@ -31,12 +31,12 @@ es6ImportNamedImportParsingError_1.ts(4,20): error TS1005: ';' expected.
 !!! error TS1434: Unexpected keyword or identifier.
                  ~~~~
 !!! error TS2304: Cannot find name 'from'.
-    import defaultBinding, from "./es6ImportNamedImportParsingError_0";
+    import defaultBinding, from "es6ImportNamedImportParsingError_0";
            ~~~~~~~~~~~~~~
 !!! error TS1192: Module '"es6ImportNamedImportParsingError_0"' has no default export.
                            ~~~~
 !!! error TS1005: '{' expected.
-    import , { a } from "./es6ImportNamedImportParsingError_0";
+    import , { a } from "es6ImportNamedImportParsingError_0";
     ~~~~~~
 !!! error TS1128: Declaration or statement expected.
            ~
@@ -45,10 +45,10 @@ es6ImportNamedImportParsingError_1.ts(4,20): error TS1005: ';' expected.
 !!! error TS1434: Unexpected keyword or identifier.
                    ~~~~
 !!! error TS2304: Cannot find name 'from'.
-    import { a }, from "./es6ImportNamedImportParsingError_0";
+    import { a }, from "es6ImportNamedImportParsingError_0";
                 ~
 !!! error TS1005: 'from' expected.
                 ~~~~~~
 !!! error TS1141: String literal expected.
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1005: ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.js b/tests/baselines/reference/es6ImportNamedImportParsingError.js
index 733e5c2d1446d..76f14f91ff2b3 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.js
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.js
@@ -6,10 +6,10 @@ export var x = a;
 export var m = a;
 
 //// [es6ImportNamedImportParsingError_1.ts]
-import { * } from "./es6ImportNamedImportParsingError_0";
-import defaultBinding, from "./es6ImportNamedImportParsingError_0";
-import , { a } from "./es6ImportNamedImportParsingError_0";
-import { a }, from "./es6ImportNamedImportParsingError_0";
+import { * } from "es6ImportNamedImportParsingError_0";
+import defaultBinding, from "es6ImportNamedImportParsingError_0";
+import , { a } from "es6ImportNamedImportParsingError_0";
+import { a }, from "es6ImportNamedImportParsingError_0";
 
 //// [es6ImportNamedImportParsingError_0.js]
 export var a = 10;
@@ -17,11 +17,11 @@ export var x = a;
 export var m = a;
 //// [es6ImportNamedImportParsingError_1.js]
 from;
-"./es6ImportNamedImportParsingError_0";
+"es6ImportNamedImportParsingError_0";
 {
     a;
 }
 from;
-"./es6ImportNamedImportParsingError_0";
+"es6ImportNamedImportParsingError_0";
 import { a } from , from;
-"./es6ImportNamedImportParsingError_0";
+"es6ImportNamedImportParsingError_0";
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.symbols b/tests/baselines/reference/es6ImportNamedImportParsingError.symbols
index e721430df5cef..107241ff45244 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.symbols
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.symbols
@@ -13,13 +13,13 @@ export var m = a;
 >a : Symbol(a, Decl(es6ImportNamedImportParsingError_0.ts, 0, 10))
 
 === es6ImportNamedImportParsingError_1.ts ===
-import { * } from "./es6ImportNamedImportParsingError_0";
-import defaultBinding, from "./es6ImportNamedImportParsingError_0";
+import { * } from "es6ImportNamedImportParsingError_0";
+import defaultBinding, from "es6ImportNamedImportParsingError_0";
 >defaultBinding : Symbol(defaultBinding, Decl(es6ImportNamedImportParsingError_1.ts, 1, 6))
 
-import , { a } from "./es6ImportNamedImportParsingError_0";
+import , { a } from "es6ImportNamedImportParsingError_0";
 >a : Symbol(a, Decl(es6ImportNamedImportParsingError_1.ts, 3, 8))
 
-import { a }, from "./es6ImportNamedImportParsingError_0";
+import { a }, from "es6ImportNamedImportParsingError_0";
 >a : Symbol(a, Decl(es6ImportNamedImportParsingError_1.ts, 3, 8))
 
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.types b/tests/baselines/reference/es6ImportNamedImportParsingError.types
index 95d9d0b14d3e8..dcd8838559d76 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.types
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.types
@@ -20,7 +20,7 @@ export var m = a;
 >  : ^^^^^^
 
 === es6ImportNamedImportParsingError_1.ts ===
-import { * } from "./es6ImportNamedImportParsingError_0";
+import { * } from "es6ImportNamedImportParsingError_0";
 >* : number
 >  : ^^^^^^
 > : any
@@ -29,22 +29,22 @@ import { * } from "./es6ImportNamedImportParsingError_0";
 > : ^^^
 >from : any
 >     : ^^^
->"./es6ImportNamedImportParsingError_0" : "./es6ImportNamedImportParsingError_0"
->                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>"es6ImportNamedImportParsingError_0" : "es6ImportNamedImportParsingError_0"
+>                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-import defaultBinding, from "./es6ImportNamedImportParsingError_0";
+import defaultBinding, from "es6ImportNamedImportParsingError_0";
 >defaultBinding : any
 >               : ^^^
 
-import , { a } from "./es6ImportNamedImportParsingError_0";
+import , { a } from "es6ImportNamedImportParsingError_0";
 >a : any
 >  : ^^^
 >from : any
 >     : ^^^
->"./es6ImportNamedImportParsingError_0" : "./es6ImportNamedImportParsingError_0"
->                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>"es6ImportNamedImportParsingError_0" : "es6ImportNamedImportParsingError_0"
+>                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-import { a }, from "./es6ImportNamedImportParsingError_0";
+import { a }, from "es6ImportNamedImportParsingError_0";
 >a : any
 >  : ^^^
 >, from : any
@@ -53,6 +53,6 @@ import { a }, from "./es6ImportNamedImportParsingError_0";
 > : ^^^
 >from : any
 >     : ^^^
->"./es6ImportNamedImportParsingError_0" : "./es6ImportNamedImportParsingError_0"
->                                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>"es6ImportNamedImportParsingError_0" : "es6ImportNamedImportParsingError_0"
+>                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClause.errors.txt b/tests/baselines/reference/es6ImportWithoutFromClause.errors.txt
deleted file mode 100644
index a6ae72d663c4b..0000000000000
--- a/tests/baselines/reference/es6ImportWithoutFromClause.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-es6ImportWithoutFromClause_1.ts(1,8): error TS2882: Cannot find module or type declarations for side-effect import of 'es6ImportWithoutFromClause_0'.
-
-
-==== es6ImportWithoutFromClause_0.ts (0 errors) ====
-    export var a = 10;
-    
-==== es6ImportWithoutFromClause_1.ts (1 errors) ====
-    import "es6ImportWithoutFromClause_0";
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2882: Cannot find module or type declarations for side-effect import of 'es6ImportWithoutFromClause_0'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.errors.txt b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.errors.txt
deleted file mode 100644
index 62a89df938e50..0000000000000
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6ImportWithoutFromClauseAmd_0.ts (0 errors) ====
-    export var a = 10;
-    
-==== es6ImportWithoutFromClauseAmd_1.ts (0 errors) ====
-    export var b = 10;
-    
-==== es6ImportWithoutFromClauseAmd_2.ts (0 errors) ====
-    import "es6ImportWithoutFromClauseAmd_0"; 
-    import "es6ImportWithoutFromClauseAmd_2";
-    var _a = 10;
-    var _b = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt
deleted file mode 100644
index 114a6e0d44a14..0000000000000
--- a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-es6ImportWithoutFromClauseNonInstantiatedModule_1.ts(1,8): error TS2882: Cannot find module or type declarations for side-effect import of 'es6ImportWithoutFromClauseNonInstantiatedModule_0'.
-
-
-==== es6ImportWithoutFromClauseNonInstantiatedModule_0.ts (0 errors) ====
-    export interface i {
-    }
-    
-==== es6ImportWithoutFromClauseNonInstantiatedModule_1.ts (1 errors) ====
-    import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2882: Cannot find module or type declarations for side-effect import of 'es6ImportWithoutFromClauseNonInstantiatedModule_0'.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
deleted file mode 100644
index daf9bb741924e..0000000000000
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== es6ModuleWithModuleGenTargetAmd.ts (0 errors) ====
-    export class A
-    {
-        constructor ()
-        {
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6modulekindWithES5Target10.errors.txt b/tests/baselines/reference/es6modulekindWithES5Target10.errors.txt
index 8b45346535972..b186d3622092f 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target10.errors.txt
+++ b/tests/baselines/reference/es6modulekindWithES5Target10.errors.txt
@@ -1,5 +1,5 @@
 es6modulekindWithES5Target10.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
-es6modulekindWithES5Target10.ts(1,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+es6modulekindWithES5Target10.ts(1,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 es6modulekindWithES5Target10.ts(6,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
 
 
@@ -8,7 +8,7 @@ es6modulekindWithES5Target10.ts(6,1): error TS1203: Export assignment cannot be
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
                        ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     
     namespace N {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt b/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt
index 7753787618825..eb4cb6d4feda0 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt
+++ b/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt
@@ -1,22 +1,22 @@
-es6modulekindWithES5Target9.ts(1,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-es6modulekindWithES5Target9.ts(3,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-es6modulekindWithES5Target9.ts(5,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-es6modulekindWithES5Target9.ts(13,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-es6modulekindWithES5Target9.ts(15,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+es6modulekindWithES5Target9.ts(1,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+es6modulekindWithES5Target9.ts(3,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+es6modulekindWithES5Target9.ts(5,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+es6modulekindWithES5Target9.ts(13,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+es6modulekindWithES5Target9.ts(15,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== es6modulekindWithES5Target9.ts (5 errors) ====
     import d from "mod";
                   ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     import {a} from "mod";
                     ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     import * as M from "mod";
                        ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     export {a};
     
@@ -26,11 +26,11 @@ es6modulekindWithES5Target9.ts(15,17): error TS2307: Cannot find module 'mod' or
     
     export * from "mod";
                   ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     export {b} from "mod"
                     ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     export default d;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt
index da6d8195b1e06..4e02a0aa1f994 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(6,1): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,1): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (2 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt
index 657dc265c2631..22a986b9e5a3f 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(6,16): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,16): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,16): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt
index 604b8d5ef42f5..34f05ae11fab0 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(6,1): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,1): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,1): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt
index 7f097b90519d4..ff8f45539b4d6 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt
index ded49d9dbb2d6..b47515bd36ec2 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (2 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt
index 159602037907b..af0c5e359fa6a 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt
index 1e4931d2da24d..8b14940e4d002 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt
index 1ee336acfa1ae..4cb66dd237a97 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt
index 38dc9bc586074..b898766dbb070 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt
index 763a76014c14e..d08a1c6ef44be 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt
index 24fbc1625dd91..489843175f354 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt
index e35e3c3b1106e..a1fbd5c590608 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt
index b77962ffe3e9a..2b1d68632ddf9 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt
index def48e013e92f..3cb1ee85a8a9f 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt
index cdc9d8b50e5c9..870c3f04cae09 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (2 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt
index 17da55b9cb616..5cea45d643ee6 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt
index aee17b86ec519..13f357800ef76 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt
index f56990d1a61da..c6dd8dec742ef 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {}
     
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt
index 4174a28ed1865..f7da9e69d2a1b 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(4,18): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,18): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,18): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     declare var dec: any;
     
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt
index 36b4326789a61..158223d45b0c8 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt
index 5e0780d3a7ac9..6edc9212fbd14 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt
index f3d883d83eb61..f510e6aea6006 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(5,16): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,16): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,16): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt
index aef7415378c72..ebde494ee6eb1 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(4,20): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,20): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,20): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     declare var dec: any;
     
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt
index c4ba413982997..29120dafafd8b 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(6,9): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,9): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,9): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,9): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (4 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt
index 3d0af4507d5b0..d964b2c8c093c 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(5,15): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,15): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,15): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt
index 2ffb54ed36493..ee9cd74f912e2 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(6,17): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,17): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,17): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(6,17): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (4 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt
index c43881c25729c..f510b08fac8a5 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(8,13): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,13): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(8,13): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt
index ad47215331f2a..d5166e4ac5081 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(4,18): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,18): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (2 errors) ====
     declare var dec: any;
     
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt
index b5d3930d6cc43..32e3c26fce6c4 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(4,17): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,17): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,17): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     declare var dec: any;
     
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt
index 656b9cb545ddf..512e41daf1ef5 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt
index 55bdbeefbf202..cae8fa9adaf4e 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,6): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,6): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,6): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt
index b01d2ed809d18..51303bf08520a 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(5,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt
index 1bd8a9a65a631..7436b7408a045 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,11): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,11): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,11): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt
index 51011b66f0781..dd1464b64ce68 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,8): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,8): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,8): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt
index acd3b2d3a9316..abadcda487de8 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(7,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export {};
     declare var dec: any;
diff --git a/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt b/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt
index ff07793e48fe6..ad250e2728344 100644
--- a/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt
+++ b/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /importer-cjs.cjs(2,5): error TS2351: This expression is not constructable.
   Type 'String' has no construct signatures.
 /importer-cts.cts(2,5): error TS2351: This expression is not constructable.
@@ -9,7 +8,6 @@ error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functio
 /importer-cts.cts(10,10): error TS2614: Module '"./exporter.mjs"' has no exported member 'Oops'. Did you mean to use 'import Oops from "./exporter.mjs"' instead?
 
 
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /importer-cjs.cjs (1 errors) ====
     const Foo = require("./exporter.mjs");
     new Foo();
diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target10.errors.txt b/tests/baselines/reference/esnextmodulekindWithES5Target10.errors.txt
index 6d6f0ee1c7f09..f4acb47125619 100644
--- a/tests/baselines/reference/esnextmodulekindWithES5Target10.errors.txt
+++ b/tests/baselines/reference/esnextmodulekindWithES5Target10.errors.txt
@@ -1,5 +1,5 @@
 esnextmodulekindWithES5Target10.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
-esnextmodulekindWithES5Target10.ts(1,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+esnextmodulekindWithES5Target10.ts(1,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 esnextmodulekindWithES5Target10.ts(6,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
 
 
@@ -8,7 +8,7 @@ esnextmodulekindWithES5Target10.ts(6,1): error TS1203: Export assignment cannot
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
                        ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     
     namespace N {
diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt b/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt
index 191ac8fdf02ea..d41afa4b5bc8f 100644
--- a/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt
+++ b/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt
@@ -1,22 +1,22 @@
-esnextmodulekindWithES5Target9.ts(1,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-esnextmodulekindWithES5Target9.ts(3,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-esnextmodulekindWithES5Target9.ts(5,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-esnextmodulekindWithES5Target9.ts(13,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
-esnextmodulekindWithES5Target9.ts(15,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+esnextmodulekindWithES5Target9.ts(1,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+esnextmodulekindWithES5Target9.ts(3,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+esnextmodulekindWithES5Target9.ts(5,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+esnextmodulekindWithES5Target9.ts(13,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+esnextmodulekindWithES5Target9.ts(15,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== esnextmodulekindWithES5Target9.ts (5 errors) ====
     import d from "mod";
                   ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     import {a} from "mod";
                     ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     import * as M from "mod";
                        ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     export {a};
     
@@ -26,11 +26,11 @@ esnextmodulekindWithES5Target9.ts(15,17): error TS2307: Cannot find module 'mod'
     
     export * from "mod";
                   ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     export {b} from "mod"
                     ~~~~~
-!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
     export default d;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js b/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js
index c904bbf93da34..9ebf994cfc518 100644
--- a/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js
+++ b/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js
@@ -11,12 +11,9 @@ Foo.bar = () => { };
 
 //// [expandoFunctionContextualTypesNoValue.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Foo = Foo;
 // GH #38532
-var blah_1 = __importDefault(require("blah"));
+var blah_1 = require("blah");
 function Foo() { }
 blah_1.default.bar = function () { };
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.errors.txt b/tests/baselines/reference/exportAndImport-es5-amd.errors.txt
deleted file mode 100644
index fbd8e108ce86b..0000000000000
--- a/tests/baselines/reference/exportAndImport-es5-amd.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export default function f1() {
-    }
-    
-==== m2.ts (0 errors) ====
-    import f1 from "./m1";
-    export default function f2() {
-        f1();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index b27a0a519d9ce..2166231cbeb21 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -20,14 +20,10 @@ define(["require", "exports"], function (require, exports) {
     }
 });
 //// [m2.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f2;
-    m1_1 = __importDefault(m1_1);
     function f2() {
         (0, m1_1.default)();
     }
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index 928ede233b00d..e8276bb8d3f67 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -19,12 +19,9 @@ function f1() {
 }
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f2;
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 function f2() {
     (0, m1_1.default)();
 }
diff --git a/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt b/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt
index 1159c91568a33..ff31f3962ef4c 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2304: Cannot find name 'ns'.
 1.ts(3,1): error TS2304: Cannot find name 'ns'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace1(module=amd).js b/tests/baselines/reference/exportAsNamespace1(module=amd).js
index b14714c193667..743ddb8c5462f 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=amd).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=amd).js
@@ -24,85 +24,18 @@ define(["require", "exports"], function (require, exports) {
     exports.b = 2;
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "./0"], function (require, exports, ns) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ns = void 0;
-    exports.ns = __importStar(ns);
+    exports.ns = ns;
     ns.a;
     ns.b;
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "./1"], function (require, exports, foo) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    foo = __importStar(foo);
     foo.ns.a;
     foo.ns.b;
 });
diff --git a/tests/baselines/reference/exportAsNamespace1(module=commonjs).js b/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
index 1a80426816409..9dbeb657616d2 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
@@ -23,81 +23,15 @@ exports.a = 1;
 exports.b = 2;
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ns = void 0;
-exports.ns = __importStar(require("./0"));
+exports.ns = require("./0");
 ns.a;
 ns.b;
 //// [2.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var foo = __importStar(require("./1"));
+var foo = require("./1");
 foo.ns.a;
 foo.ns.b;
 
diff --git a/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt b/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt
index df44389973192..ff31f3962ef4c 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2304: Cannot find name 'ns'.
 1.ts(3,1): error TS2304: Cannot find name 'ns'.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace1(module=umd).errors.txt b/tests/baselines/reference/exportAsNamespace1(module=umd).errors.txt
index 3ee3aa98ebae4..ff31f3962ef4c 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=umd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace1(module=umd).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2304: Cannot find name 'ns'.
 1.ts(3,1): error TS2304: Cannot find name 'ns'.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace1(module=umd).js b/tests/baselines/reference/exportAsNamespace1(module=umd).js
index 6b8a07a601090..d1218984d89f8 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=umd).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=umd).js
@@ -32,39 +32,6 @@ foo.ns.b;
     exports.b = 2;
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -77,44 +44,11 @@ var __importStar = (this && this.__importStar) || (function () {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ns = void 0;
-    exports.ns = __importStar(require("./0"));
+    exports.ns = require("./0");
     ns.a;
     ns.b;
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -126,7 +60,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var foo = __importStar(require("./1"));
+    var foo = require("./1");
     foo.ns.a;
     foo.ns.b;
 });
diff --git a/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt b/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt
index 1159c91568a33..ff31f3962ef4c 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2304: Cannot find name 'ns'.
 1.ts(3,1): error TS2304: Cannot find name 'ns'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace2(module=system).errors.txt b/tests/baselines/reference/exportAsNamespace2(module=system).errors.txt
index df44389973192..ff31f3962ef4c 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=system).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace2(module=system).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2304: Cannot find name 'ns'.
 1.ts(3,1): error TS2304: Cannot find name 'ns'.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace2(module=umd).errors.txt b/tests/baselines/reference/exportAsNamespace2(module=umd).errors.txt
index 3ee3aa98ebae4..ff31f3962ef4c 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=umd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace2(module=umd).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2304: Cannot find name 'ns'.
 1.ts(3,1): error TS2304: Cannot find name 'ns'.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace3(module=amd).errors.txt b/tests/baselines/reference/exportAsNamespace3(module=amd).errors.txt
index f03649ce2aa4c..0e4bd2c40ddf8 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=amd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace3(module=amd).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2448: Block-scoped variable 'ns' used before its declaration.
 1.ts(3,1): error TS2448: Block-scoped variable 'ns' used before its declaration.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace3(module=system).errors.txt b/tests/baselines/reference/exportAsNamespace3(module=system).errors.txt
index 6a32c48a93bfc..0e4bd2c40ddf8 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=system).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace3(module=system).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2448: Block-scoped variable 'ns' used before its declaration.
 1.ts(3,1): error TS2448: Block-scoped variable 'ns' used before its declaration.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace3(module=umd).errors.txt b/tests/baselines/reference/exportAsNamespace3(module=umd).errors.txt
index e62ed7ccf9f5f..0e4bd2c40ddf8 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=umd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace3(module=umd).errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(2,1): error TS2448: Block-scoped variable 'ns' used before its declaration.
 1.ts(3,1): error TS2448: Block-scoped variable 'ns' used before its declaration.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export const a = 1;
     export const b = 2;
diff --git a/tests/baselines/reference/exportAsNamespace4(module=amd).errors.txt b/tests/baselines/reference/exportAsNamespace4(module=amd).errors.txt
deleted file mode 100644
index e46e730ffe438..0000000000000
--- a/tests/baselines/reference/exportAsNamespace4(module=amd).errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export const a = 1;
-    export const b = 2;
-    
-==== 1.ts (0 errors) ====
-    export * as default from './0';
-    
-==== 11.ts (0 errors) ====
-    import * as ns from './0';
-    export default ns;
-    
-==== 2.ts (0 errors) ====
-    import foo from './1'
-    import foo1 from './11'
-    
-    foo.a;
-    foo1.a;
-    
-    foo.b;
-    foo1.b;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAsNamespace4(module=system).errors.txt b/tests/baselines/reference/exportAsNamespace4(module=system).errors.txt
deleted file mode 100644
index 7463cadac52aa..0000000000000
--- a/tests/baselines/reference/exportAsNamespace4(module=system).errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export const a = 1;
-    export const b = 2;
-    
-==== 1.ts (0 errors) ====
-    export * as default from './0';
-    
-==== 11.ts (0 errors) ====
-    import * as ns from './0';
-    export default ns;
-    
-==== 2.ts (0 errors) ====
-    import foo from './1'
-    import foo1 from './11'
-    
-    foo.a;
-    foo1.a;
-    
-    foo.b;
-    foo1.b;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAsNamespace4(module=umd).errors.txt b/tests/baselines/reference/exportAsNamespace4(module=umd).errors.txt
deleted file mode 100644
index e75848124401b..0000000000000
--- a/tests/baselines/reference/exportAsNamespace4(module=umd).errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export const a = 1;
-    export const b = 2;
-    
-==== 1.ts (0 errors) ====
-    export * as default from './0';
-    
-==== 11.ts (0 errors) ====
-    import * as ns from './0';
-    export default ns;
-    
-==== 2.ts (0 errors) ====
-    import foo from './1'
-    import foo1 from './11'
-    
-    foo.a;
-    foo1.a;
-    
-    foo.b;
-    foo1.b;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAsNamespace_augment.js b/tests/baselines/reference/exportAsNamespace_augment.js
index be9787a943931..9557e5cb0d403 100644
--- a/tests/baselines/reference/exportAsNamespace_augment.js
+++ b/tests/baselines/reference/exportAsNamespace_augment.js
@@ -26,40 +26,7 @@ a2.x + a2.y + a2.z + a2.conflict;
 
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a2 = __importStar(require("./a"));
+var a2 = require("./a");
 a.x + a.y + a.z + a.conflict;
 a2.x + a2.y + a2.z + a2.conflict;
diff --git a/tests/baselines/reference/exportAsNamespace_nonExistent.errors.txt b/tests/baselines/reference/exportAsNamespace_nonExistent.errors.txt
index 2a8a7b7e7c210..32dc546b4b404 100644
--- a/tests/baselines/reference/exportAsNamespace_nonExistent.errors.txt
+++ b/tests/baselines/reference/exportAsNamespace_nonExistent.errors.txt
@@ -1,8 +1,8 @@
-exportAsNamespace_nonExistent.ts(1,21): error TS2307: Cannot find module './nonexistent' or its corresponding type declarations.
+exportAsNamespace_nonExistent.ts(1,21): error TS2792: Cannot find module './nonexistent'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== exportAsNamespace_nonExistent.ts (1 errors) ====
     export * as ns from './nonexistent'; // Error
                         ~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './nonexistent' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './nonexistent'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt
deleted file mode 100644
index af55cf2bcb992..0000000000000
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignedTypeAsTypeAnnotation_1.ts (0 errors) ====
-    ///<reference path='exportAssignedTypeAsTypeAnnotation_0.ts'/>
-    import test = require('exportAssignedTypeAsTypeAnnotation_0');
-    var t2: test; // should not raise a 'container type' error
-    
-==== exportAssignedTypeAsTypeAnnotation_0.ts (0 errors) ====
-    interface x {
-        (): Date;
-        foo: string;
-    }
-    export = x;
-     
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js
index b24a09d8629b2..76261c23bec97 100644
--- a/tests/baselines/reference/exportAssignmentAndDeclaration.js
+++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js
@@ -13,17 +13,19 @@ class C1 {
 export = C1;
 
 //// [foo_0.js]
-"use strict";
-exports.E1 = void 0;
-var E1;
-(function (E1) {
-    E1[E1["A"] = 0] = "A";
-    E1[E1["B"] = 1] = "B";
-    E1[E1["C"] = 2] = "C";
-})(E1 || (exports.E1 = E1 = {}));
-var C1 = /** @class */ (function () {
-    function C1() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.E1 = void 0;
+    var E1;
+    (function (E1) {
+        E1[E1["A"] = 0] = "A";
+        E1[E1["B"] = 1] = "B";
+        E1[E1["C"] = 2] = "C";
+    })(E1 || (exports.E1 = E1 = {}));
+    var C1 = /** @class */ (function () {
+        function C1() {
+        }
+        return C1;
+    }());
     return C1;
-}());
-module.exports = C1;
+});
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.errors.txt b/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
deleted file mode 100644
index 8139a2496da62..0000000000000
--- a/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_2.ts (0 errors) ====
-    import foo0 = require("./foo_0");
-    namespace Foo {
-    	export var x = foo0.x;
-    }
-    export = Foo;
-    
-==== foo_0.ts (0 errors) ====
-    import foo1 = require('./foo_1');
-    namespace Foo {
-    	export var x = foo1.x;
-    }
-    export = Foo;
-    
-==== foo_1.ts (0 errors) ====
-    import foo2 = require("./foo_2");
-    namespace Foo {
-    	export var x = foo2.x;
-    }
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.types b/tests/baselines/reference/exportAssignmentCircularModules.types
index 120a5f84eb82f..151ac1b4bd314 100644
--- a/tests/baselines/reference/exportAssignmentCircularModules.types
+++ b/tests/baselines/reference/exportAssignmentCircularModules.types
@@ -11,9 +11,7 @@ namespace Foo {
 
 	export var x = foo0.x;
 >x : any
->  : ^^^
 >foo0.x : any
->       : ^^^
 >foo0 : typeof foo0
 >     : ^^^^^^^^^^^
 >x : any
@@ -34,9 +32,7 @@ namespace Foo {
 
 	export var x = foo1.x;
 >x : any
->  : ^^^
 >foo1.x : any
->       : ^^^
 >foo1 : typeof foo1
 >     : ^^^^^^^^^^^
 >x : any
@@ -57,9 +53,7 @@ namespace Foo {
 
 	export var x = foo2.x;
 >x : any
->  : ^^^
 >foo2.x : any
->       : ^^^
 >foo2 : typeof foo2
 >     : ^^^^^^^^^^^
 >x : any
diff --git a/tests/baselines/reference/exportAssignmentClass.errors.txt b/tests/baselines/reference/exportAssignmentClass.errors.txt
deleted file mode 100644
index 08cfa54b0ddbd..0000000000000
--- a/tests/baselines/reference/exportAssignmentClass.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentClass_B.ts (0 errors) ====
-    import D = require("exportAssignmentClass_A");
-    
-    var d = new D();
-    var x = d.p;
-==== exportAssignmentClass_A.ts (0 errors) ====
-    class C { public p = 0; }
-    
-    export = C;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentError.errors.txt b/tests/baselines/reference/exportAssignmentError.errors.txt
deleted file mode 100644
index e61d4a7a08bfe..0000000000000
--- a/tests/baselines/reference/exportAssignmentError.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEqualsModule_A.ts (0 errors) ====
-    namespace M {
-    	export var x;
-    }
-    
-    import M2 = M;
-    
-    export = M2; // should not error
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentError.types b/tests/baselines/reference/exportAssignmentError.types
index 41a4bf2a71d40..4d8c3914486fc 100644
--- a/tests/baselines/reference/exportAssignmentError.types
+++ b/tests/baselines/reference/exportAssignmentError.types
@@ -7,7 +7,6 @@ namespace M {
 
 	export var x;
 >x : any
->  : ^^^
 }
 
 import M2 = M;
diff --git a/tests/baselines/reference/exportAssignmentFunction.errors.txt b/tests/baselines/reference/exportAssignmentFunction.errors.txt
deleted file mode 100644
index f50cfd3039c89..0000000000000
--- a/tests/baselines/reference/exportAssignmentFunction.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentFunction_B.ts (0 errors) ====
-    import fooFunc = require("exportAssignmentFunction_A");
-    
-    var n: number = fooFunc();
-==== exportAssignmentFunction_A.ts (0 errors) ====
-    function foo() { return 0; }
-    
-    export = foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js b/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js
index 1c58ea2637496..3a3239933f878 100644
--- a/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js
+++ b/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js
@@ -19,10 +19,7 @@ exports.default = {
 };
 //// [user.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Obj = void 0;
-var assignment_1 = __importDefault(require("./assignment"));
+var assignment_1 = require("./assignment");
 exports.Obj = void exports.Obj;
diff --git a/tests/baselines/reference/exportAssignmentInterface.errors.txt b/tests/baselines/reference/exportAssignmentInterface.errors.txt
deleted file mode 100644
index 5819cbfb57ba1..0000000000000
--- a/tests/baselines/reference/exportAssignmentInterface.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentInterface_B.ts (0 errors) ====
-    import I1 = require("exportAssignmentInterface_A");
-    
-    var i: I1;
-    
-    var n: number = i.p1;
-==== exportAssignmentInterface_A.ts (0 errors) ====
-    interface A {
-    	p1: number;
-    }
-    
-    export = A;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.errors.txt b/tests/baselines/reference/exportAssignmentInternalModule.errors.txt
deleted file mode 100644
index 08a6ff256afc4..0000000000000
--- a/tests/baselines/reference/exportAssignmentInternalModule.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentInternalModule_B.ts (0 errors) ====
-    import modM = require("exportAssignmentInternalModule_A");
-    
-    var n: number = modM.x;
-==== exportAssignmentInternalModule_A.ts (0 errors) ====
-    namespace M {
-    	export var x;
-    }
-    
-    export = M;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.types b/tests/baselines/reference/exportAssignmentInternalModule.types
index fdf464092b80c..4252f9a9762e9 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.types
+++ b/tests/baselines/reference/exportAssignmentInternalModule.types
@@ -9,7 +9,6 @@ var n: number = modM.x;
 >n : number
 >  : ^^^^^^
 >modM.x : any
->       : ^^^
 >modM : typeof modM
 >     : ^^^^^^^^^^^
 >x : any
@@ -22,7 +21,6 @@ namespace M {
 
 	export var x;
 >x : any
->  : ^^^
 }
 
 export = M;
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.errors.txt b/tests/baselines/reference/exportAssignmentMergedInterface.errors.txt
deleted file mode 100644
index a59a87835dcdd..0000000000000
--- a/tests/baselines/reference/exportAssignmentMergedInterface.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    var x: foo;
-    x("test");
-    x(42);
-    var y: string = x.b;
-    if(!!x.c){ }
-    var z = {x: 1, y: 2};
-    z = x.d;
-==== foo_0.ts (0 errors) ====
-    interface Foo {
-    	(a: string): void;
-    	b: string;
-    }
-    interface Foo {
-    	(a: number): number;
-    	c: boolean;
-    	d: {x: number; y: number};
-    }
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.errors.txt b/tests/baselines/reference/exportAssignmentOfGenericType1.errors.txt
deleted file mode 100644
index 57ef430040935..0000000000000
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentOfGenericType1_1.ts (0 errors) ====
-    ///<reference path='exportAssignmentOfGenericType1_0.ts'/>
-    import q = require("exportAssignmentOfGenericType1_0");
-    
-    class M extends q<string> { }
-    var m: M;
-    var r: string = m.foo;
-    
-==== exportAssignmentOfGenericType1_0.ts (0 errors) ====
-    export = T;
-    class T<X> { foo: X; }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
deleted file mode 100644
index 4871c9caa789a..0000000000000
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    if(foo.answer === 42){
-    	var x = new foo();
-    }
-    
-==== foo_0.ts (0 errors) ====
-    class Foo {
-    	test = "test";
-    }
-    namespace Foo {
-    	export var answer = 42;
-    }
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
deleted file mode 100644
index 47a3c979cdc64..0000000000000
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    var color: foo;
-    if(color === foo.green){
-    	color = foo.answer;
-    }
-    
-==== foo_0.ts (0 errors) ====
-    enum foo {
-    	red, green, blue
-    }
-    namespace foo {
-    	export var answer = 42;
-    }
-    export = foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
deleted file mode 100644
index 3194b2bcde931..0000000000000
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    if(foo.answer === 42){
-    	var x = foo();
-    }
-    
-==== foo_0.ts (0 errors) ====
-    function foo() {
-    	return "test";
-    }
-    namespace foo {
-    	export var answer = 42;
-    }
-    export = foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
deleted file mode 100644
index e6bee6ac2e5bb..0000000000000
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_1.ts (0 errors) ====
-    import foo = require("./foo_0");
-    if(foo.answer === 42){
-    
-    }
-    
-==== foo_0.ts (0 errors) ====
-    namespace Foo {
-    	export var answer = 42;
-    }
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
deleted file mode 100644
index 9059f5e6fa00c..0000000000000
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentWithImportStatementPrivacyError.ts (0 errors) ====
-    namespace m2 {
-        export interface connectModule {
-            (res, req, next): void;
-        }
-        export interface connectExport {
-            use: (mod: connectModule) => connectExport;
-            listen: (port: number) => void;
-        }
-    
-    }
-    
-    namespace M {
-        export var server: {
-            (): m2.connectExport;
-            test1: m2.connectModule;
-            test2(): m2.connectModule;
-        };
-    }
-    import M22 = M;
-    
-    export = M;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
index b686a55db029b..b435a095a4ca4 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
@@ -5,11 +5,8 @@ namespace m2 {
     export interface connectModule {
         (res, req, next): void;
 >res : any
->    : ^^^
 >req : any
->    : ^^^
 >next : any
->     : ^^^
     }
     export interface connectExport {
         use: (mod: connectModule) => connectExport;
diff --git a/tests/baselines/reference/exportAssignmentWithPrivacyError.errors.txt b/tests/baselines/reference/exportAssignmentWithPrivacyError.errors.txt
deleted file mode 100644
index 4687a3ce4e308..0000000000000
--- a/tests/baselines/reference/exportAssignmentWithPrivacyError.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportAssignmentWithPrivacyError.ts (0 errors) ====
-    interface connectmodule {
-        (res, req, next): void;
-    }
-    interface connectexport {
-        use: (mod: connectmodule) => connectexport;
-        listen: (port: number) => void;
-    }
-    
-    var server: {
-        (): connectexport;
-        test1: connectmodule;
-        test2(): connectmodule;
-    };
-    
-    export = server;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithPrivacyError.types b/tests/baselines/reference/exportAssignmentWithPrivacyError.types
index 3ec8b1fdf2cf7..2119f68a7ff33 100644
--- a/tests/baselines/reference/exportAssignmentWithPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithPrivacyError.types
@@ -4,11 +4,8 @@
 interface connectmodule {
     (res, req, next): void;
 >res : any
->    : ^^^
 >req : any
->    : ^^^
 >next : any
->     : ^^^
 }
 interface connectexport {
     use: (mod: connectmodule) => connectexport;
diff --git a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt
index 74bd5f32c2ea0..ba44def77ef37 100644
--- a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt
+++ b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt
@@ -1,4 +1,5 @@
 /bar.ts(1,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
+/foo.ts(1,8): error TS1259: Module '"/bar"' can only be default-imported using the 'allowSyntheticDefaultImports' flag
 
 
 ==== /bar.ts (1 errors) ====
@@ -7,5 +8,8 @@
 !!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
     function bar() {}
     
-==== /foo.ts (0 errors) ====
-    import bar from './bar';
\ No newline at end of file
+==== /foo.ts (1 errors) ====
+    import bar from './bar';
+           ~~~
+!!! error TS1259: Module '"/bar"' can only be default-imported using the 'allowSyntheticDefaultImports' flag
+!!! related TS2594 /bar.ts:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types
index 927a7075cfaac..8777fae23902b 100644
--- a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types
+++ b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types
@@ -11,6 +11,6 @@ function bar() {}
 
 === /foo.ts ===
 import bar from './bar';
->bar : () => void
->    : ^^^^^^^^^^
+>bar : any
+>    : ^^^
 
diff --git a/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt b/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt
index d1f275d2c57fe..465856a9af92f 100644
--- a/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt
+++ b/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportClassNameWithObjectAMD.ts(1,14): error TS2725: Class name cannot be 'Object' when targeting ES5 and above with module AMD.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportClassNameWithObjectAMD.ts (1 errors) ====
     export class Object {}
                  ~~~~~~
diff --git a/tests/baselines/reference/exportClassNameWithObjectSystem.errors.txt b/tests/baselines/reference/exportClassNameWithObjectSystem.errors.txt
index 1bdf1d731f8dc..e7d609e955497 100644
--- a/tests/baselines/reference/exportClassNameWithObjectSystem.errors.txt
+++ b/tests/baselines/reference/exportClassNameWithObjectSystem.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportClassNameWithObjectSystem.ts(1,14): error TS2725: Class name cannot be 'Object' when targeting ES5 and above with module System.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportClassNameWithObjectSystem.ts (1 errors) ====
     export class Object {}
                  ~~~~~~
diff --git a/tests/baselines/reference/exportClassNameWithObjectUMD.errors.txt b/tests/baselines/reference/exportClassNameWithObjectUMD.errors.txt
index be409a0a7c40d..eaf05918ac298 100644
--- a/tests/baselines/reference/exportClassNameWithObjectUMD.errors.txt
+++ b/tests/baselines/reference/exportClassNameWithObjectUMD.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportClassNameWithObjectUMD.ts(1,14): error TS2725: Class name cannot be 'Object' when targeting ES5 and above with module UMD.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportClassNameWithObjectUMD.ts (1 errors) ====
     export class Object {}
                  ~~~~~~
diff --git a/tests/baselines/reference/exportDeclarationForModuleOrEnumWithMemberOfSameName(module=system).errors.txt b/tests/baselines/reference/exportDeclarationForModuleOrEnumWithMemberOfSameName(module=system).errors.txt
deleted file mode 100644
index 6adc1bffd0dce..0000000000000
--- a/tests/baselines/reference/exportDeclarationForModuleOrEnumWithMemberOfSameName(module=system).errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportDeclarationForModuleOrEnumWithMemberOfSameName.ts (0 errors) ====
-    // https://github.com/microsoft/TypeScript/issues/55038
-    
-    namespace A {
-        export const A = 0;
-    }
-    
-    export { A }
-    
-    enum B {
-        B
-    }
-    
-    export { B }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js
index c0aadda3896da..9113e3fa85c1e 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -12,7 +12,9 @@
     };
 
 //// [exportDeclareClass1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-;
-;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    ;
+    ;
+});
diff --git a/tests/baselines/reference/exportDefaultAbstractClass.js b/tests/baselines/reference/exportDefaultAbstractClass.js
index 1430cf402ba05..bfd94efbe1e68 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -61,11 +61,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 var C = /** @class */ (function (_super) {
     __extends(C, _super);
     function C() {
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.errors.txt b/tests/baselines/reference/exportDefaultAsyncFunction2.errors.txt
index 90e5a3e61775f..1493eabe3f369 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.errors.txt
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.errors.txt
@@ -12,7 +12,7 @@ e.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the
 !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module.
     
 ==== a.ts (1 errors) ====
-    import { async, await } from './asyncawait';
+    import { async, await } from 'asyncawait';
                     ~~~~~
 !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module.
     export default async(() => await(Promise.resolve(1)));
@@ -21,20 +21,20 @@ e.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the
     export default async () => { return 0; };
     
 ==== c.ts (1 errors) ====
-    import { async, await } from './asyncawait';
+    import { async, await } from 'asyncawait';
                     ~~~~~
 !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module.
     export default async<number>();
     
 ==== d.ts (1 errors) ====
-    import { async, await } from './asyncawait';
+    import { async, await } from 'asyncawait';
                     ~~~~~
 !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module.
     
     export default async;
     
 ==== e.ts (1 errors) ====
-    import { async, await } from './asyncawait';
+    import { async, await } from 'asyncawait';
                     ~~~~~
 !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module.
     
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.js b/tests/baselines/reference/exportDefaultAsyncFunction2.js
index db979c7f77f0e..a94ad0f12d4a1 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.js
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.js
@@ -5,23 +5,23 @@ export function async<T>(...args: any[]): any { }
 export function await(...args: any[]): any { }
 
 //// [a.ts]
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 export default async(() => await(Promise.resolve(1)));
 
 //// [b.ts]
 export default async () => { return 0; };
 
 //// [c.ts]
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 export default async<number>();
 
 //// [d.ts]
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 
 export default async;
 
 //// [e.ts]
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 
 export default async
 
@@ -31,7 +31,7 @@ export function foo() { }
 export function async(...args) { }
 export function await(...args) { }
 //// [a.js]
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 export default async(() => await(Promise.resolve(1)));
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -45,12 +45,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 export default () => __awaiter(void 0, void 0, void 0, function* () { return 0; });
 //// [c.js]
-import { async } from './asyncawait';
+import { async } from 'asyncawait';
 export default async();
 //// [d.js]
-import { async } from './asyncawait';
+import { async } from 'asyncawait';
 export default async;
 //// [e.js]
-import { async } from './asyncawait';
+import { async } from 'asyncawait';
 export default async;
 export function foo() { }
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.symbols b/tests/baselines/reference/exportDefaultAsyncFunction2.symbols
index 449e44d6e43f5..04733e02f0de0 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.symbols
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.symbols
@@ -11,7 +11,7 @@ export function await(...args: any[]): any { }
 >args : Symbol(args, Decl(asyncawait.ts, 1, 22))
 
 === a.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : Symbol(async, Decl(a.ts, 0, 8))
 >await : Symbol(await, Decl(a.ts, 0, 15))
 
@@ -27,7 +27,7 @@ export default async(() => await(Promise.resolve(1)));
 export default async () => { return 0; };
 
 === c.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : Symbol(async, Decl(c.ts, 0, 8))
 >await : Symbol(await, Decl(c.ts, 0, 15))
 
@@ -35,7 +35,7 @@ export default async<number>();
 >async : Symbol(async, Decl(c.ts, 0, 8))
 
 === d.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : Symbol(async, Decl(d.ts, 0, 8))
 >await : Symbol(await, Decl(d.ts, 0, 15))
 
@@ -43,7 +43,7 @@ export default async;
 >async : Symbol(async, Decl(d.ts, 0, 8))
 
 === e.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : Symbol(async, Decl(e.ts, 0, 8))
 >await : Symbol(await, Decl(e.ts, 0, 15))
 
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.types b/tests/baselines/reference/exportDefaultAsyncFunction2.types
index 1ef7626cc94c4..e99b663eddc9c 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.types
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.types
@@ -14,7 +14,7 @@ export function await(...args: any[]): any { }
 >     : ^^^^^
 
 === a.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : <T>(...args: any[]) => any
 >      : ^ ^^^^^    ^^     ^^^^^   
 >await : (...args: any[]) => any
@@ -50,7 +50,7 @@ export default async () => { return 0; };
 >  : ^
 
 === c.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : <T>(...args: any[]) => any
 >      : ^ ^^^^^    ^^     ^^^^^   
 >await : (...args: any[]) => any
@@ -63,7 +63,7 @@ export default async<number>();
 >      : ^ ^^^^^    ^^     ^^^^^   
 
 === d.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : <T>(...args: any[]) => any
 >      : ^ ^^^^^    ^^     ^^^^^   
 >await : (...args: any[]) => any
@@ -74,7 +74,7 @@ export default async;
 >      : ^ ^^^^^    ^^     ^^^^^   
 
 === e.ts ===
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 >async : <T>(...args: any[]) => any
 >      : ^ ^^^^^    ^^     ^^^^^   
 >await : (...args: any[]) => any
diff --git a/tests/baselines/reference/exportDefaultDuplicateCrash.js b/tests/baselines/reference/exportDefaultDuplicateCrash.js
index bb41acfacda07..763e73582e48f 100644
--- a/tests/baselines/reference/exportDefaultDuplicateCrash.js
+++ b/tests/baselines/reference/exportDefaultDuplicateCrash.js
@@ -11,14 +11,11 @@ export { aa as default } from './hi'
 //// [exportDefaultDuplicateCrash.js]
 "use strict";
 // #38214
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = void 0;
 exports.default = default_1;
 function default_1() { }
 var hi_1 = require("./hi");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(hi_1).default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return hi_1.default; } });
 var hi_2 = require("./hi");
 Object.defineProperty(exports, "default", { enumerable: true, get: function () { return hi_2.aa; } });
diff --git a/tests/baselines/reference/exportDefaultMarksIdentifierAsUsed.js b/tests/baselines/reference/exportDefaultMarksIdentifierAsUsed.js
index 6062f3a06e9f9..5772dcfa15f2f 100644
--- a/tests/baselines/reference/exportDefaultMarksIdentifierAsUsed.js
+++ b/tests/baselines/reference/exportDefaultMarksIdentifierAsUsed.js
@@ -15,9 +15,6 @@ const Obj = {};
 exports.default = Obj;
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const a_1 = __importDefault(require("./a"));
+const a_1 = require("./a");
 a_1.default.fn = function () { };
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 37b8ceaa7ee77..929727efb1da5 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -61,17 +61,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "foo".length;
 //// [index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="declarations.d.ts" />
-var foobar_1 = __importDefault(require("foobar"));
+var foobar_1 = require("foobar");
 var X = foobar_1.default.X;
-var foobarx_1 = __importDefault(require("foobarx"));
+var foobarx_1 = require("foobarx");
 var x = X;
 var x2 = foobarx_1.default;
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 var b = new a_1.default(a_1.default.b);
-var b_1 = __importDefault(require("./b"));
+var b_1 = require("./b");
 b_1.default + 1;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index d443c7c7bf810..278fe519ae121 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -26,9 +26,6 @@ var C = /** @class */ (function () {
 exports.default = C.B;
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 var x = { c: a_1.default };
diff --git a/tests/baselines/reference/exportDefaultQualifiedNameNoError.js b/tests/baselines/reference/exportDefaultQualifiedNameNoError.js
index 4967fe1663984..01866f10a27af 100644
--- a/tests/baselines/reference/exportDefaultQualifiedNameNoError.js
+++ b/tests/baselines/reference/exportDefaultQualifiedNameNoError.js
@@ -20,9 +20,6 @@ var C = /** @class */ (function () {
 exports.default = C.x;
 //// [usage.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var code_1 = __importDefault(require("./code"));
+var code_1 = require("./code");
 void code_1.default;
diff --git a/tests/baselines/reference/exportDefaultStripsFreshness.js b/tests/baselines/reference/exportDefaultStripsFreshness.js
index 6dc48b99369ca..e6a1563297bfa 100644
--- a/tests/baselines/reference/exportDefaultStripsFreshness.js
+++ b/tests/baselines/reference/exportDefaultStripsFreshness.js
@@ -35,41 +35,8 @@ exports.q = {
 };
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var items_1 = __importStar(require("./items"));
+var items_1 = require("./items");
 function nFoo(x) { }
 nFoo(items_1.q); // for comparison
 nFoo(items_1.default);
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt
deleted file mode 100644
index 8d8f3cb86598a..0000000000000
--- a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyArrayBindingPattern.ts (0 errors) ====
-    export const [] = [];
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).errors.txt b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).errors.txt
deleted file mode 100644
index 8d8f3cb86598a..0000000000000
--- a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyArrayBindingPattern.ts (0 errors) ====
-    export const [] = [];
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).errors.txt b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).errors.txt
deleted file mode 100644
index 94c89d6851f79..0000000000000
--- a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyArrayBindingPattern.ts (0 errors) ====
-    export const [] = [];
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).errors.txt b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).errors.txt
deleted file mode 100644
index 94c89d6851f79..0000000000000
--- a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyArrayBindingPattern.ts (0 errors) ====
-    export const [] = [];
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).errors.txt b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).errors.txt
deleted file mode 100644
index e4c070bf9a248..0000000000000
--- a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyObjectBindingPattern.ts (0 errors) ====
-    export const {} = {};
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).errors.txt b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).errors.txt
deleted file mode 100644
index e4c070bf9a248..0000000000000
--- a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyObjectBindingPattern.ts (0 errors) ====
-    export const {} = {};
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).errors.txt b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).errors.txt
deleted file mode 100644
index 5b1950bd36383..0000000000000
--- a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyObjectBindingPattern.ts (0 errors) ====
-    export const {} = {};
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).errors.txt b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).errors.txt
deleted file mode 100644
index 5b1950bd36383..0000000000000
--- a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEmptyObjectBindingPattern.ts (0 errors) ====
-    export const {} = {};
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualCallable.errors.txt b/tests/baselines/reference/exportEqualCallable.errors.txt
deleted file mode 100644
index 7475b379fa220..0000000000000
--- a/tests/baselines/reference/exportEqualCallable.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEqualCallable_1.ts (0 errors) ====
-    ///<reference path='exportEqualCallable_0.ts'/>
-    import connect = require('exportEqualCallable_0');
-    connect();
-    
-==== exportEqualCallable_0.ts (0 errors) ====
-    var server: {
-        (): any;
-    };
-    export = server;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualCallable.types b/tests/baselines/reference/exportEqualCallable.types
index 32737681c30b4..5b8019a84ef5c 100644
--- a/tests/baselines/reference/exportEqualCallable.types
+++ b/tests/baselines/reference/exportEqualCallable.types
@@ -8,7 +8,6 @@ import connect = require('exportEqualCallable_0');
 
 connect();
 >connect() : any
->          : ^^^
 >connect : () => any
 >        : ^^^^^^   
 
diff --git a/tests/baselines/reference/exportEqualErrorType.errors.txt b/tests/baselines/reference/exportEqualErrorType.errors.txt
index 37b58684c5726..353d337102237 100644
--- a/tests/baselines/reference/exportEqualErrorType.errors.txt
+++ b/tests/baselines/reference/exportEqualErrorType.errors.txt
@@ -3,7 +3,7 @@ exportEqualErrorType_1.ts(3,23): error TS2339: Property 'static' does not exist
 
 ==== exportEqualErrorType_1.ts (1 errors) ====
     ///<reference path='exportEqualErrorType_0.ts'/>
-    import connect = require('./exportEqualErrorType_0');
+    import connect = require('exportEqualErrorType_0');
     connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
                           ~~~~~~
 !!! error TS2339: Property 'static' does not exist on type '{ (): connectExport; foo: Date; }'.
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index d1221baaa86d3..a2b2bed5b4e7d 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -17,17 +17,19 @@ export = server;
  
 //// [exportEqualErrorType_1.ts]
 ///<reference path='exportEqualErrorType_0.ts'/>
-import connect = require('./exportEqualErrorType_0');
+import connect = require('exportEqualErrorType_0');
 connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
 
 
 //// [exportEqualErrorType_0.js]
-"use strict";
-var server;
-module.exports = server;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var server;
+    return server;
+});
 //// [exportEqualErrorType_1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-///<reference path='exportEqualErrorType_0.ts'/>
-var connect = require("./exportEqualErrorType_0");
-connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
+define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
+});
diff --git a/tests/baselines/reference/exportEqualErrorType.symbols b/tests/baselines/reference/exportEqualErrorType.symbols
index d56b1472fdb58..772dcee14d993 100644
--- a/tests/baselines/reference/exportEqualErrorType.symbols
+++ b/tests/baselines/reference/exportEqualErrorType.symbols
@@ -2,7 +2,7 @@
 
 === exportEqualErrorType_1.ts ===
 ///<reference path='exportEqualErrorType_0.ts'/>
-import connect = require('./exportEqualErrorType_0');
+import connect = require('exportEqualErrorType_0');
 >connect : Symbol(connect, Decl(exportEqualErrorType_1.ts, 0, 0))
 
 connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
diff --git a/tests/baselines/reference/exportEqualErrorType.types b/tests/baselines/reference/exportEqualErrorType.types
index 673882b391485..721fe4fa0be5d 100644
--- a/tests/baselines/reference/exportEqualErrorType.types
+++ b/tests/baselines/reference/exportEqualErrorType.types
@@ -2,7 +2,7 @@
 
 === exportEqualErrorType_1.ts ===
 ///<reference path='exportEqualErrorType_0.ts'/>
-import connect = require('./exportEqualErrorType_0');
+import connect = require('exportEqualErrorType_0');
 >connect : { (): connect.connectExport; foo: Date; }
 >        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^
 
diff --git a/tests/baselines/reference/exportEqualNamespaces.errors.txt b/tests/baselines/reference/exportEqualNamespaces.errors.txt
deleted file mode 100644
index ca17006547792..0000000000000
--- a/tests/baselines/reference/exportEqualNamespaces.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEqualNamespaces.ts (0 errors) ====
-    declare namespace server {
-        interface Server extends Object { }
-    }
-    
-    interface server {
-        (): server.Server;
-        startTime: Date;
-    }
-     
-    var x = 5;
-    var server = new Date();
-    export = server;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualsAmd.errors.txt b/tests/baselines/reference/exportEqualsAmd.errors.txt
deleted file mode 100644
index 109ada07a0b38..0000000000000
--- a/tests/baselines/reference/exportEqualsAmd.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEqualsAmd.ts (0 errors) ====
-    export = { ["hi"]: "there" };
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index a2c18f2792732..0efeedc4b80f6 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -22,9 +22,6 @@ var x = {
 module.exports = x;
 //// [imp.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var exp_1 = __importDefault(require("./exp"));
+var exp_1 = require("./exp");
 exp_1.default.toExponential(2);
diff --git a/tests/baselines/reference/exportEqualsUmd.errors.txt b/tests/baselines/reference/exportEqualsUmd.errors.txt
deleted file mode 100644
index b0deffd6c65f7..0000000000000
--- a/tests/baselines/reference/exportEqualsUmd.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportEqualsUmd.ts (0 errors) ====
-    export = { ["hi"]: "there" };
\ No newline at end of file
diff --git a/tests/baselines/reference/exportImport.errors.txt b/tests/baselines/reference/exportImport.errors.txt
deleted file mode 100644
index b48d4b1a5ddb8..0000000000000
--- a/tests/baselines/reference/exportImport.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== consumer.ts (0 errors) ====
-    import e = require('./exporter');
-    
-    export function w(): e.w { // Should be OK
-        return new e.w();
-    }
-==== w1.ts (0 errors) ====
-    export = Widget1
-    class Widget1 { name = 'one'; }
-    
-==== exporter.ts (0 errors) ====
-    export import w = require('./w1');
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
deleted file mode 100644
index 08a44fab214f6..0000000000000
--- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportImportCanSubstituteConstEnumForValue.ts (0 errors) ====
-    namespace MsPortalFx.ViewModels.Dialogs {
-    
-        export const enum DialogResult {
-            Abort,
-            Cancel,
-            Ignore,
-            No,
-            Ok,
-            Retry,
-            Yes,
-        }
-    
-        export interface DialogResultCallback {
-            (result: MsPortalFx.ViewModels.Dialogs.DialogResult): void;
-        }
-    
-        export function someExportedFunction() {
-        }
-    
-        export const enum MessageBoxButtons {
-            AbortRetryIgnore,
-            OK,
-            OKCancel,
-            RetryCancel,
-            YesNo,
-            YesNoCancel,
-        }
-    }
-    
-    
-    namespace MsPortalFx.ViewModels {
-    
-        /**
-         * For some reason javascript code is emitted for this re-exported const enum.
-         */
-        export import ReExportedEnum = Dialogs.DialogResult;
-    
-        /**
-         * Not exported to show difference. No javascript is emmitted (as expected)
-         */
-        import DialogButtons = Dialogs.MessageBoxButtons;
-    
-        /**
-         * Re-exporting a function type to show difference. No javascript is emmitted (as expected)
-         */
-        export import Callback = Dialogs.DialogResultCallback;
-    
-        export class SomeUsagesOfTheseConsts {
-            constructor() {
-                // these do get replaced by the const value
-                const value1 = ReExportedEnum.Cancel;
-                console.log(value1);
-                const value2 = DialogButtons.OKCancel;
-                console.log(value2);
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportImportMultipleFiles.errors.txt b/tests/baselines/reference/exportImportMultipleFiles.errors.txt
deleted file mode 100644
index a9e71232f82a7..0000000000000
--- a/tests/baselines/reference/exportImportMultipleFiles.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportImportMultipleFiles_userCode.ts (0 errors) ====
-    import lib = require('./exportImportMultipleFiles_library');
-    lib.math.add(3, 4); // Shouldnt be error
-    
-==== exportImportMultipleFiles_math.ts (0 errors) ====
-    export function add(a, b) { return a + b; }
-    
-==== exportImportMultipleFiles_library.ts (0 errors) ====
-    export import math = require("exportImportMultipleFiles_math");
-    math.add(3, 4); // OK
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportImportMultipleFiles.types b/tests/baselines/reference/exportImportMultipleFiles.types
index 0dc9157861f77..a48cac713405b 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.types
+++ b/tests/baselines/reference/exportImportMultipleFiles.types
@@ -7,7 +7,6 @@ import lib = require('./exportImportMultipleFiles_library');
 
 lib.math.add(3, 4); // Shouldnt be error
 >lib.math.add(3, 4) : any
->                   : ^^^
 >lib.math.add : (a: any, b: any) => any
 >             : ^ ^^^^^^^ ^^^^^^^^^^^^^
 >lib.math : typeof lib.math
@@ -28,15 +27,10 @@ export function add(a, b) { return a + b; }
 >add : (a: any, b: any) => any
 >    : ^ ^^^^^^^ ^^^^^^^^^^^^^
 >a : any
->  : ^^^
 >b : any
->  : ^^^
 >a + b : any
->      : ^^^
 >a : any
->  : ^^^
 >b : any
->  : ^^^
 
 === exportImportMultipleFiles_library.ts ===
 export import math = require("exportImportMultipleFiles_math");
@@ -45,7 +39,6 @@ export import math = require("exportImportMultipleFiles_math");
 
 math.add(3, 4); // OK
 >math.add(3, 4) : any
->               : ^^^
 >math.add : (a: any, b: any) => any
 >         : ^ ^^^^^^^ ^^^^^^^^^^^^^
 >math : typeof math
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.errors.txt b/tests/baselines/reference/exportImportNonInstantiatedModule2.errors.txt
deleted file mode 100644
index 87b37a469c97e..0000000000000
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== consumer.ts (0 errors) ====
-    import e = require('./exporter');
-    
-    export function w(): e.w { // Should be OK
-        return {name: 'value' };
-    }
-==== w1.ts (0 errors) ====
-    export = Widget1
-    interface Widget1 { name: string; }
-    
-==== exporter.ts (0 errors) ====
-    export import w = require('./w1');
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportNamespace11.js b/tests/baselines/reference/exportNamespace11.js
index 3ba4fdcba59f1..b2b30c103d246 100644
--- a/tests/baselines/reference/exportNamespace11.js
+++ b/tests/baselines/reference/exportNamespace11.js
@@ -25,39 +25,6 @@ exports.Ghost = Ghost;
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var intermediate = __importStar(require("./intermediate"));
+var intermediate = require("./intermediate");
 var ghost = new intermediate.Ghost();
diff --git a/tests/baselines/reference/exportNamespace12.js b/tests/baselines/reference/exportNamespace12.js
index a370d8e73660b..a78bb4460622c 100644
--- a/tests/baselines/reference/exportNamespace12.js
+++ b/tests/baselines/reference/exportNamespace12.js
@@ -22,40 +22,7 @@ exports.c = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var types = __importStar(require("./types"));
+var types = require("./types");
 console.log(c); // Fails as expected, import is still allowed though.
 console.log(types.c); // Expected an error here.
diff --git a/tests/baselines/reference/exportNamespace2.js b/tests/baselines/reference/exportNamespace2.js
index de24d2f3d5d7b..7d72538b17ee0 100644
--- a/tests/baselines/reference/exportNamespace2.js
+++ b/tests/baselines/reference/exportNamespace2.js
@@ -27,42 +27,9 @@ var A = /** @class */ (function () {
 exports.A = A;
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-exports.a = __importStar(require("./a"));
+exports.a = require("./a");
 //// [c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportNamespace3.js b/tests/baselines/reference/exportNamespace3.js
index 3822e2de6058a..0eb384c6d5f0d 100644
--- a/tests/baselines/reference/exportNamespace3.js
+++ b/tests/baselines/reference/exportNamespace3.js
@@ -29,42 +29,9 @@ exports.A = A;
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [c.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-exports.a = __importStar(require("./b"));
+exports.a = require("./b");
 //// [d.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt
index 664639988cfeb..520ff7afd5b52 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportNonInitializedVariablesAMD.ts(1,4): error TS1123: Variable declaration list cannot be empty.
 exportNonInitializedVariablesAMD.ts(2,1): error TS1214: Identifier expected. 'let' is a reserved word in strict mode. Modules are automatically in strict mode.
 exportNonInitializedVariablesAMD.ts(2,1): error TS2304: Cannot find name 'let'.
 exportNonInitializedVariablesAMD.ts(3,6): error TS1123: Variable declaration list cannot be empty.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportNonInitializedVariablesAMD.ts (4 errors) ====
     var;
        
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt
index b95c5b458b001..dd7b763f5af3b 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,1): error TS1184: Modifiers cannot appear here.
 exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,14): error TS1155: 'const' declarations must be initialized.
 exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,26): error TS2304: Cannot find name 'CssExports'.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts (3 errors) ====
     // https://github.com/microsoft/TypeScript/issues/59373
     
diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt
index ee1371e651cff..76b499d5a09e3 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportNonInitializedVariablesSystem.ts(1,4): error TS1123: Variable declaration list cannot be empty.
 exportNonInitializedVariablesSystem.ts(2,1): error TS1214: Identifier expected. 'let' is a reserved word in strict mode. Modules are automatically in strict mode.
 exportNonInitializedVariablesSystem.ts(2,1): error TS2304: Cannot find name 'let'.
 exportNonInitializedVariablesSystem.ts(3,6): error TS1123: Variable declaration list cannot be empty.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportNonInitializedVariablesSystem.ts (4 errors) ====
     var;
        
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt
index 34d3e8a5268a8..dfb9b25e27521 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 exportNonInitializedVariablesUMD.ts(1,4): error TS1123: Variable declaration list cannot be empty.
 exportNonInitializedVariablesUMD.ts(2,1): error TS1214: Identifier expected. 'let' is a reserved word in strict mode. Modules are automatically in strict mode.
 exportNonInitializedVariablesUMD.ts(2,1): error TS2304: Cannot find name 'let'.
 exportNonInitializedVariablesUMD.ts(3,6): error TS1123: Variable declaration list cannot be empty.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== exportNonInitializedVariablesUMD.ts (4 errors) ====
     var;
        
diff --git a/tests/baselines/reference/exportObjectRest(module=amd,target=es5).errors.txt b/tests/baselines/reference/exportObjectRest(module=amd,target=es5).errors.txt
deleted file mode 100644
index 0784723ac4eba..0000000000000
--- a/tests/baselines/reference/exportObjectRest(module=amd,target=es5).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportObjectRest.ts (0 errors) ====
-    export const { x, ...rest } = { x: 'x', y: 'y' };
\ No newline at end of file
diff --git a/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).errors.txt b/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).errors.txt
deleted file mode 100644
index 0784723ac4eba..0000000000000
--- a/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportObjectRest.ts (0 errors) ====
-    export const { x, ...rest } = { x: 'x', y: 'y' };
\ No newline at end of file
diff --git a/tests/baselines/reference/exportObjectRest(module=system,target=es5).errors.txt b/tests/baselines/reference/exportObjectRest(module=system,target=es5).errors.txt
deleted file mode 100644
index 853c7607d5bd4..0000000000000
--- a/tests/baselines/reference/exportObjectRest(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportObjectRest.ts (0 errors) ====
-    export const { x, ...rest } = { x: 'x', y: 'y' };
\ No newline at end of file
diff --git a/tests/baselines/reference/exportObjectRest(module=system,target=esnext).errors.txt b/tests/baselines/reference/exportObjectRest(module=system,target=esnext).errors.txt
deleted file mode 100644
index 853c7607d5bd4..0000000000000
--- a/tests/baselines/reference/exportObjectRest(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportObjectRest.ts (0 errors) ====
-    export const { x, ...rest } = { x: 'x', y: 'y' };
\ No newline at end of file
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index 88272ae169bb1..f1a455adfcba3 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -6,10 +6,12 @@ export function a() {
 }
 
 //// [exportSameNameFuncVar.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.a = void 0;
-exports.a = a;
-exports.a = 10;
-function a() {
-}
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = a;
+    exports.a = 10;
+    function a() {
+    }
+});
diff --git a/tests/baselines/reference/exportStar-amd.errors.txt b/tests/baselines/reference/exportStar-amd.errors.txt
index 8748c15b93066..4402aed8a528c 100644
--- a/tests/baselines/reference/exportStar-amd.errors.txt
+++ b/tests/baselines/reference/exportStar-amd.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,8): error TS1192: Module '"t4"' has no default export.
 t4.ts(3,1): error TS2308: Module "./t1" has already exported a member named 'x'. Consider explicitly re-exporting to resolve the ambiguity.
 t4.ts(3,1): error TS2308: Module "./t1" has already exported a member named 'y'. Consider explicitly re-exporting to resolve the ambiguity.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== t1.ts (0 errors) ====
     export var x = 1;
     export var y = 2;
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 13ddf83e2a391..5821f27ee4510 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -79,43 +79,9 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     __exportStar(t3_1, exports);
 });
 //// [main.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    t4_1 = __importStar(t4_1);
     t4_1.default;
     t4_1.x;
     t4_1.y;
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index 3a16afcf3c530..5b33ce88b7787 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -72,41 +72,8 @@ __exportStar(require("./t2"), exports);
 __exportStar(require("./t3"), exports);
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var t4_1 = __importStar(require("./t4"));
+var t4_1 = require("./t4");
 t4_1.default;
 t4_1.x;
 t4_1.y;
diff --git a/tests/baselines/reference/exportStarForValues.errors.txt b/tests/baselines/reference/exportStarForValues.errors.txt
deleted file mode 100644
index b4d58eee90433..0000000000000
--- a/tests/baselines/reference/exportStarForValues.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file1"
-    var x;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues.types b/tests/baselines/reference/exportStarForValues.types
index 871cd5b0f56e1..aa9264c0320ef 100644
--- a/tests/baselines/reference/exportStarForValues.types
+++ b/tests/baselines/reference/exportStarForValues.types
@@ -3,11 +3,9 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file1"
 var x;
 >x : any
->  : ^^^
 
diff --git a/tests/baselines/reference/exportStarForValues10.errors.txt b/tests/baselines/reference/exportStarForValues10.errors.txt
deleted file mode 100644
index 3142d441005e9..0000000000000
--- a/tests/baselines/reference/exportStarForValues10.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file0.ts (0 errors) ====
-    export var v = 1;
-    
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file0";
-    export * from "file1";
-    var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues10.types b/tests/baselines/reference/exportStarForValues10.types
index 6247012e71de2..802ef0b3fa4de 100644
--- a/tests/baselines/reference/exportStarForValues10.types
+++ b/tests/baselines/reference/exportStarForValues10.types
@@ -10,7 +10,6 @@ export var v = 1;
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file0";
diff --git a/tests/baselines/reference/exportStarForValues2.errors.txt b/tests/baselines/reference/exportStarForValues2.errors.txt
deleted file mode 100644
index 5680653d5a3fb..0000000000000
--- a/tests/baselines/reference/exportStarForValues2.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file1"
-    var x = 1;
-    
-==== file3.ts (0 errors) ====
-    export * from "file2"
-    var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues2.types b/tests/baselines/reference/exportStarForValues2.types
index fc56e15a695df..a29af65fda472 100644
--- a/tests/baselines/reference/exportStarForValues2.types
+++ b/tests/baselines/reference/exportStarForValues2.types
@@ -3,7 +3,6 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarForValues3.errors.txt b/tests/baselines/reference/exportStarForValues3.errors.txt
deleted file mode 100644
index 0640eb34d952a..0000000000000
--- a/tests/baselines/reference/exportStarForValues3.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export interface A { x }
-    export * from "file1"
-    var x = 1;
-    
-==== file3.ts (0 errors) ====
-    export interface B { x }
-    export * from "file1"
-    var x = 1;
-    
-==== file4.ts (0 errors) ====
-    export interface C { x }
-    export * from "file2"
-    export * from "file3"
-    var x = 1;
-    
-==== file5.ts (0 errors) ====
-    export * from "file4"
-    var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues3.types b/tests/baselines/reference/exportStarForValues3.types
index a148ed78e8bb0..5462a43e429be 100644
--- a/tests/baselines/reference/exportStarForValues3.types
+++ b/tests/baselines/reference/exportStarForValues3.types
@@ -3,12 +3,10 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
->  : ^^^
 
 export * from "file1"
 var x = 1;
@@ -20,7 +18,6 @@ var x = 1;
 === file3.ts ===
 export interface B { x }
 >x : any
->  : ^^^
 
 export * from "file1"
 var x = 1;
@@ -32,7 +29,6 @@ var x = 1;
 === file4.ts ===
 export interface C { x }
 >x : any
->  : ^^^
 
 export * from "file2"
 export * from "file3"
diff --git a/tests/baselines/reference/exportStarForValues4.errors.txt b/tests/baselines/reference/exportStarForValues4.errors.txt
deleted file mode 100644
index fd09144bdd859..0000000000000
--- a/tests/baselines/reference/exportStarForValues4.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export interface A { x }
-    export * from "file1"
-    export * from "file3"
-    var x = 1;
-    
-==== file3.ts (0 errors) ====
-    export interface B { x }
-    export * from "file2"
-    var x = 1;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues4.types b/tests/baselines/reference/exportStarForValues4.types
index 3d6fb0b98bd78..a2fb7cee6f67f 100644
--- a/tests/baselines/reference/exportStarForValues4.types
+++ b/tests/baselines/reference/exportStarForValues4.types
@@ -3,12 +3,10 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
->  : ^^^
 
 export * from "file1"
 export * from "file3"
@@ -21,7 +19,6 @@ var x = 1;
 === file3.ts ===
 export interface B { x }
 >x : any
->  : ^^^
 
 export * from "file2"
 var x = 1;
diff --git a/tests/baselines/reference/exportStarForValues5.errors.txt b/tests/baselines/reference/exportStarForValues5.errors.txt
deleted file mode 100644
index 04e9a2de78350..0000000000000
--- a/tests/baselines/reference/exportStarForValues5.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file1"
-    export var x;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues5.types b/tests/baselines/reference/exportStarForValues5.types
index a4c35c407a189..bbb495b7d300c 100644
--- a/tests/baselines/reference/exportStarForValues5.types
+++ b/tests/baselines/reference/exportStarForValues5.types
@@ -3,11 +3,9 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file1"
 export var x;
 >x : any
->  : ^^^
 
diff --git a/tests/baselines/reference/exportStarForValues6.errors.txt b/tests/baselines/reference/exportStarForValues6.errors.txt
deleted file mode 100644
index 61aeeb4d979fb..0000000000000
--- a/tests/baselines/reference/exportStarForValues6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file1"
-    export var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues6.types b/tests/baselines/reference/exportStarForValues6.types
index e1cbed0fcea6e..52c9f8b191aa2 100644
--- a/tests/baselines/reference/exportStarForValues6.types
+++ b/tests/baselines/reference/exportStarForValues6.types
@@ -3,7 +3,6 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarForValues7.errors.txt b/tests/baselines/reference/exportStarForValues7.errors.txt
deleted file mode 100644
index 7f3335da1330a..0000000000000
--- a/tests/baselines/reference/exportStarForValues7.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file1"
-    export var x = 1;
-    
-==== file3.ts (0 errors) ====
-    export * from "file2"
-    export var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues7.types b/tests/baselines/reference/exportStarForValues7.types
index 922de7ca91316..feb0e4b106698 100644
--- a/tests/baselines/reference/exportStarForValues7.types
+++ b/tests/baselines/reference/exportStarForValues7.types
@@ -3,7 +3,6 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarForValues8.errors.txt b/tests/baselines/reference/exportStarForValues8.errors.txt
deleted file mode 100644
index b497d6a214095..0000000000000
--- a/tests/baselines/reference/exportStarForValues8.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export interface A { x }
-    export * from "file1"
-    export var x = 1;
-    
-==== file3.ts (0 errors) ====
-    export interface B { x }
-    export * from "file1"
-    export var x = 1;
-    
-==== file4.ts (0 errors) ====
-    export interface C { x }
-    export * from "file2"
-    export * from "file3"
-    export var x = 1;
-    
-==== file5.ts (0 errors) ====
-    export * from "file4"
-    export var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues8.types b/tests/baselines/reference/exportStarForValues8.types
index 1db59be84051b..9a9b611509790 100644
--- a/tests/baselines/reference/exportStarForValues8.types
+++ b/tests/baselines/reference/exportStarForValues8.types
@@ -3,12 +3,10 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
->  : ^^^
 
 export * from "file1"
 export var x = 1;
@@ -20,7 +18,6 @@ export var x = 1;
 === file3.ts ===
 export interface B { x }
 >x : any
->  : ^^^
 
 export * from "file1"
 export var x = 1;
@@ -32,7 +29,6 @@ export var x = 1;
 === file4.ts ===
 export interface C { x }
 >x : any
->  : ^^^
 
 export * from "file2"
 export * from "file3"
diff --git a/tests/baselines/reference/exportStarForValues9.errors.txt b/tests/baselines/reference/exportStarForValues9.errors.txt
deleted file mode 100644
index aaf8f74716874..0000000000000
--- a/tests/baselines/reference/exportStarForValues9.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export interface A { x }
-    export * from "file1"
-    export * from "file3"
-    export var x = 1;
-    
-==== file3.ts (0 errors) ====
-    export interface B { x }
-    export * from "file2"
-    export var x = 1;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues9.types b/tests/baselines/reference/exportStarForValues9.types
index ddc9317942a05..470cd248d08b2 100644
--- a/tests/baselines/reference/exportStarForValues9.types
+++ b/tests/baselines/reference/exportStarForValues9.types
@@ -3,12 +3,10 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
->  : ^^^
 
 export * from "file1"
 export * from "file3"
@@ -21,7 +19,6 @@ export var x = 1;
 === file3.ts ===
 export interface B { x }
 >x : any
->  : ^^^
 
 export * from "file2"
 export var x = 1;
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.errors.txt b/tests/baselines/reference/exportStarForValuesInSystem.errors.txt
deleted file mode 100644
index 3f7dfcd355d4f..0000000000000
--- a/tests/baselines/reference/exportStarForValuesInSystem.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export interface Foo { x }
-    
-==== file2.ts (0 errors) ====
-    export * from "file1"
-    var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.types b/tests/baselines/reference/exportStarForValuesInSystem.types
index f33c43ad73c9c..104f06d759b66 100644
--- a/tests/baselines/reference/exportStarForValuesInSystem.types
+++ b/tests/baselines/reference/exportStarForValuesInSystem.types
@@ -3,7 +3,6 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
->  : ^^^
 
 === file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index 2f33395a35257..82af70c1283d8 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -62,41 +62,8 @@ var A = /** @class */ (function () {
 exports.A = A;
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var X = __importStar(require("./exportStarFromEmptyModule_module3"));
+var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
 X.A.r; // Error
diff --git a/tests/baselines/reference/exportStarNotElided.js b/tests/baselines/reference/exportStarNotElided.js
index 0b306f2cb359c..79bf5b35e9512 100644
--- a/tests/baselines/reference/exportStarNotElided.js
+++ b/tests/baselines/reference/exportStarNotElided.js
@@ -34,36 +34,14 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aliased = void 0;
 __exportStar(require("./register"), exports);
 __exportStar(require("./data1"), exports);
-exports.aliased = __importStar(require("./data1"));
+exports.aliased = require("./data1");
 //// [data1.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.js b/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.js
index 632536f4c2ab3..a783e23a6d865 100644
--- a/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.js
+++ b/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.js
@@ -21,42 +21,9 @@ export type Something<A> = S.Something<A>
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [prelude.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Something = void 0;
-exports.Something = __importStar(require("./Something"));
+exports.Something = require("./Something");
 //// [usage.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index aa903323e9fec..bbda099d1b17b 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,21 +20,26 @@ namespace NS1 {
 }
 
 //// [exportedBlockScopedDeclarations.js]
-var foo = foo; // compile error
-export var bar = bar; // should be compile error
-function f() {
-    var bar = bar; // compile error
-}
-var NS;
-(function (NS) {
-    NS.bar = NS.bar; // should be compile error
-})(NS || (NS = {}));
-var foo1 = foo1; // compile error
-export var bar1 = bar1; // should be compile error
-function f1() {
-    var bar1 = bar1; // compile error
-}
-var NS1;
-(function (NS1) {
-    NS1.bar1 = NS1.bar1; // should be compile error
-})(NS1 || (NS1 = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.bar1 = exports.bar = void 0;
+    var foo = foo; // compile error
+    exports.bar = exports.bar; // should be compile error
+    function f() {
+        var bar = bar; // compile error
+    }
+    var NS;
+    (function (NS) {
+        NS.bar = NS.bar; // should be compile error
+    })(NS || (NS = {}));
+    var foo1 = foo1; // compile error
+    exports.bar1 = exports.bar1; // should be compile error
+    function f1() {
+        var bar1 = bar1; // compile error
+    }
+    var NS1;
+    (function (NS1) {
+        NS1.bar1 = NS1.bar1; // should be compile error
+    })(NS1 || (NS1 = {}));
+});
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt
deleted file mode 100644
index fcc06f0751d10..0000000000000
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportedInterfaceInaccessibleInCallbackInModule.ts (0 errors) ====
-    export interface ProgressCallback {
-    	(progress:any):any;
-    }	
-    
-    // --- Generic promise
-    export declare class TPromise<V> {
-    	
-    	constructor(init:(complete: (value:V)=>void, error:(err:any)=>void, progress:ProgressCallback)=>void, oncancel?: any);
-    	
-        // removing this method fixes the error squiggle.....
-    	public then<U>(success?: (value:V)=>TPromise<U>, error?: (err:any)=>TPromise<U>, progress?:ProgressCallback): TPromise<U>;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
index 0900ab173c2cb..935afdee8bc0c 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
@@ -4,7 +4,6 @@
 export interface ProgressCallback {
 	(progress:any):any;
 >progress : any
->         : ^^^
 }	
 
 // --- Generic promise
@@ -22,11 +21,9 @@ export declare class TPromise<V> {
 >error : (err: any) => void
 >      : ^   ^^   ^^^^^    
 >err : any
->    : ^^^
 >progress : ProgressCallback
 >         : ^^^^^^^^^^^^^^^^
 >oncancel : any
->         : ^^^
 	
     // removing this method fixes the error squiggle.....
 	public then<U>(success?: (value:V)=>TPromise<U>, error?: (err:any)=>TPromise<U>, progress?:ProgressCallback): TPromise<U>;
@@ -39,7 +36,6 @@ export declare class TPromise<V> {
 >error : (err: any) => TPromise<U>
 >      : ^   ^^   ^^^^^           
 >err : any
->    : ^^^
 >progress : ProgressCallback
 >         : ^^^^^^^^^^^^^^^^
 }
diff --git a/tests/baselines/reference/exportedVariable1.errors.txt b/tests/baselines/reference/exportedVariable1.errors.txt
deleted file mode 100644
index fb6b7a2743519..0000000000000
--- a/tests/baselines/reference/exportedVariable1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportedVariable1.ts (0 errors) ====
-    export var foo = {name: "Bill"};
-    var upper = foo.name.toUpperCase();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportingContainingVisibleType.errors.txt b/tests/baselines/reference/exportingContainingVisibleType.errors.txt
deleted file mode 100644
index 6356281c9e6b6..0000000000000
--- a/tests/baselines/reference/exportingContainingVisibleType.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== exportingContainingVisibleType.ts (0 errors) ====
-    class Foo {
-        public get foo() {
-            var i: Foo;
-            return i; // Should be fine (previous bug report visibility error).
-     
-        }
-    }
-     
-    export var x = 5;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports1-amd.errors.txt b/tests/baselines/reference/exportsAndImports1-amd.errors.txt
deleted file mode 100644
index 0e8bd2772b0ce..0000000000000
--- a/tests/baselines/reference/exportsAndImports1-amd.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== t1.ts (0 errors) ====
-    var v = 1;
-    function f() { }
-    class C {
-    }
-    interface I {
-    }
-    enum E {
-        A, B, C
-    }
-    const enum D {
-        A, B, C
-    }
-    namespace M {
-        export var x;
-    }
-    namespace N {
-        export interface I {
-        }
-    }
-    type T = number;
-    import a = M.x;
-    
-    export { v, f, C, I, E, D, M, N, T, a };
-    
-==== t2.ts (0 errors) ====
-    export { v, f, C, I, E, D, M, N, T, a } from "./t1";
-    
-==== t3.ts (0 errors) ====
-    import { v, f, C, I, E, D, M, N, T, a } from "./t1";
-    export { v, f, C, I, E, D, M, N, T, a };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports1-amd.types b/tests/baselines/reference/exportsAndImports1-amd.types
index 39fb5dd6daa39..9039c856cffd0 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.types
+++ b/tests/baselines/reference/exportsAndImports1-amd.types
@@ -47,7 +47,6 @@ namespace M {
 
     export var x;
 >x : any
->  : ^^^
 }
 namespace N {
     export interface I {
diff --git a/tests/baselines/reference/exportsAndImports2-amd.errors.txt b/tests/baselines/reference/exportsAndImports2-amd.errors.txt
deleted file mode 100644
index 63063504aa904..0000000000000
--- a/tests/baselines/reference/exportsAndImports2-amd.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== t1.ts (0 errors) ====
-    export var x = "x";
-    export var y = "y";
-    
-==== t2.ts (0 errors) ====
-    export { x as y, y as x } from "./t1";
-    
-==== t3.ts (0 errors) ====
-    import { x, y } from "./t1";
-    export { x as y, y as x };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports3-amd.errors.txt b/tests/baselines/reference/exportsAndImports3-amd.errors.txt
deleted file mode 100644
index 524d3ac67f62d..0000000000000
--- a/tests/baselines/reference/exportsAndImports3-amd.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== t1.ts (0 errors) ====
-    export var v = 1;
-    export function f() { }
-    export class C {
-    }
-    export interface I {
-    }
-    export enum E {
-        A, B, C
-    }
-    export const enum D {
-        A, B, C
-    }
-    export namespace M {
-        export var x;
-    }
-    export namespace N {
-        export interface I {
-        }
-    }
-    export type T = number;
-    export import a = M.x;
-    
-    export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 };
-    
-==== t2.ts (0 errors) ====
-    export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
-    
-==== t3.ts (0 errors) ====
-    import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
-    export { v, f, C, I, E, D, M, N, T, a };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports3-amd.types b/tests/baselines/reference/exportsAndImports3-amd.types
index 2e58b968f8509..4616001d45901 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.types
+++ b/tests/baselines/reference/exportsAndImports3-amd.types
@@ -47,7 +47,6 @@ export namespace M {
 
     export var x;
 >x : any
->  : ^^^
 }
 export namespace N {
     export interface I {
diff --git a/tests/baselines/reference/exportsAndImports4-amd.errors.txt b/tests/baselines/reference/exportsAndImports4-amd.errors.txt
deleted file mode 100644
index 9551ab300f3e3..0000000000000
--- a/tests/baselines/reference/exportsAndImports4-amd.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== t3.ts (0 errors) ====
-    import a = require("./t1");
-    a.default;
-    import b from "./t1";
-    b;
-    import * as c from "./t1";
-    c.default;
-    import { default as d } from "./t1";
-    d;
-    import e1, * as e2 from "./t1";
-    e1;
-    e2.default;
-    import f1, { default as f2 } from "./t1";
-    f1;
-    f2;
-    export { a, b, c, d, e1, e2, f1, f2 };
-    
-==== t1.ts (0 errors) ====
-    export default "hello";
-    
-==== t2.ts (0 errors) ====
-    import a = require("./t1");
-    a.default;
-    import b from "./t1";
-    b;
-    import * as c from "./t1";
-    c.default;
-    import { default as d } from "./t1";
-    d;
-    import e1, * as e2 from "./t1";
-    e1;
-    e2.default;
-    import f1, { default as f2 } from "./t1";
-    f1;
-    f2;
-    import "./t1";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index ac0417666177f..07330f9ea1c70 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -45,51 +45,10 @@ define(["require", "exports"], function (require, exports) {
     exports.default = "hello";
 });
 //// [t3.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.f2 = exports.f1 = exports.e2 = exports.e1 = exports.d = exports.c = exports.b = exports.a = void 0;
-    t1_1 = __importDefault(t1_1);
-    c = __importStar(c);
-    t1_2 = __importDefault(t1_2);
-    t1_3 = __importStar(t1_3);
-    t1_4 = __importDefault(t1_4);
     exports.a = a;
     a.default;
     exports.b = t1_1.default;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.types b/tests/baselines/reference/exportsAndImports4-amd.types
index 562d817aa39f7..884469431ba8c 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.types
+++ b/tests/baselines/reference/exportsAndImports4-amd.types
@@ -22,13 +22,13 @@ b;
 >  : ^^^^^^^
 
 import * as c from "./t1";
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 
 c.default;
 >c.default : "hello"
 >          : ^^^^^^^
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
@@ -46,8 +46,8 @@ d;
 import e1, * as e2 from "./t1";
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 
 e1;
 >e1 : "hello"
@@ -56,8 +56,8 @@ e1;
 e2.default;
 >e2.default : "hello"
 >           : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
 
@@ -82,14 +82,14 @@ export { a, b, c, d, e1, e2, f1, f2 };
 >  : ^^^^^^^^
 >b : "hello"
 >  : ^^^^^^^
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 >d : "hello"
 >  : ^^^^^^^
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 >f1 : "hello"
 >   : ^^^^^^^
 >f2 : "hello"
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 911828220e977..baa558ec02400 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -44,62 +44,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 //// [t3.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.f2 = exports.f1 = exports.e2 = exports.e1 = exports.d = exports.c = exports.b = exports.a = void 0;
 const a = require("./t1");
 exports.a = a;
 a.default;
-const t1_1 = __importDefault(require("./t1"));
+const t1_1 = require("./t1");
 exports.b = t1_1.default;
 t1_1.default;
-const c = __importStar(require("./t1"));
+const c = require("./t1");
 exports.c = c;
 c.default;
-const t1_2 = __importDefault(require("./t1"));
+const t1_2 = require("./t1");
 Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } });
 t1_2.default;
-const t1_3 = __importStar(require("./t1")), e2 = t1_3;
+const t1_3 = require("./t1"), e2 = t1_3;
 exports.e1 = t1_3.default;
 exports.e2 = e2;
 t1_3.default;
 e2.default;
-const t1_4 = __importDefault(require("./t1"));
+const t1_4 = require("./t1");
 exports.f1 = t1_4.default;
 Object.defineProperty(exports, "f2", { enumerable: true, get: function () { return t1_4.default; } });
 t1_4.default;
diff --git a/tests/baselines/reference/exportsAndImports4-es6.types b/tests/baselines/reference/exportsAndImports4-es6.types
index 5d7d57856d777..103d301320c72 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.types
+++ b/tests/baselines/reference/exportsAndImports4-es6.types
@@ -22,13 +22,13 @@ b;
 >  : ^^^^^^^
 
 import * as c from "./t1";
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 
 c.default;
 >c.default : "hello"
 >          : ^^^^^^^
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
@@ -46,8 +46,8 @@ d;
 import e1, * as e2 from "./t1";
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 
 e1;
 >e1 : "hello"
@@ -56,8 +56,8 @@ e1;
 e2.default;
 >e2.default : "hello"
 >           : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
 
@@ -82,14 +82,14 @@ export { a, b, c, d, e1, e2, f1, f2 };
 >  : ^^^^^^^^
 >b : "hello"
 >  : ^^^^^^^
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 >d : "hello"
 >  : ^^^^^^^
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 >f1 : "hello"
 >   : ^^^^^^^
 >f2 : "hello"
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 5d9b577c1714b..1cd118d871ec3 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -44,62 +44,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 //// [t3.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.f2 = exports.f1 = exports.e2 = exports.e1 = exports.d = exports.c = exports.b = exports.a = void 0;
 var a = require("./t1");
 exports.a = a;
 a.default;
-var t1_1 = __importDefault(require("./t1"));
+var t1_1 = require("./t1");
 exports.b = t1_1.default;
 t1_1.default;
-var c = __importStar(require("./t1"));
+var c = require("./t1");
 exports.c = c;
 c.default;
-var t1_2 = __importDefault(require("./t1"));
+var t1_2 = require("./t1");
 Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } });
 t1_2.default;
-var t1_3 = __importStar(require("./t1")), e2 = t1_3;
+var t1_3 = require("./t1"), e2 = t1_3;
 exports.e1 = t1_3.default;
 exports.e2 = e2;
 t1_3.default;
 e2.default;
-var t1_4 = __importDefault(require("./t1"));
+var t1_4 = require("./t1");
 exports.f1 = t1_4.default;
 Object.defineProperty(exports, "f2", { enumerable: true, get: function () { return t1_4.default; } });
 t1_4.default;
diff --git a/tests/baselines/reference/exportsAndImports4.types b/tests/baselines/reference/exportsAndImports4.types
index caa88a91937cb..8a357eecf542d 100644
--- a/tests/baselines/reference/exportsAndImports4.types
+++ b/tests/baselines/reference/exportsAndImports4.types
@@ -22,13 +22,13 @@ b;
 >  : ^^^^^^^
 
 import * as c from "./t1";
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 
 c.default;
 >c.default : "hello"
 >          : ^^^^^^^
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
@@ -46,8 +46,8 @@ d;
 import e1, * as e2 from "./t1";
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 
 e1;
 >e1 : "hello"
@@ -56,8 +56,8 @@ e1;
 e2.default;
 >e2.default : "hello"
 >           : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
 
@@ -82,14 +82,14 @@ export { a, b, c, d, e1, e2, f1, f2 };
 >  : ^^^^^^^^
 >b : "hello"
 >  : ^^^^^^^
->c : typeof c
+>c : typeof a
 >  : ^^^^^^^^
 >d : "hello"
 >  : ^^^^^^^
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof e2
->   : ^^^^^^^^^
+>e2 : typeof a
+>   : ^^^^^^^^
 >f1 : "hello"
 >   : ^^^^^^^
 >f2 : "hello"
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index 1b129a151ca59..a06e99911d290 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -25,41 +25,8 @@ exports.return = as;
 exports.as = as;
 //// [t2.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var as = __importStar(require("./t1"));
+var as = require("./t1");
 var x = as.as;
 var y = as.return;
 //// [t3.js]
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index 867d728459633..4a79981889d1f 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -24,9 +24,6 @@ exports.default = R = {
 };
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 var __ = m1_1.default.__, _ = m1_1.default._, ___ = m1_1.default.___;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 856df513e84ea..4d4f0e53c1679 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -22,9 +22,6 @@ exports.default = R = {
 };
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 var __esmodule = m1_1.default.__esmodule, __proto__ = m1_1.default.__proto__;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index cb7bfc7d06ac6..66d8c70e4cb5c 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -24,9 +24,6 @@ exports.default = R = {
 };
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 var ___ = m1_1.default.___, ___hello = m1_1.default.___hello, _hi = m1_1.default._hi;
diff --git a/tests/baselines/reference/exportsInAmbientModules1.errors.txt b/tests/baselines/reference/exportsInAmbientModules1.errors.txt
deleted file mode 100644
index 51aeb42533ebe..0000000000000
--- a/tests/baselines/reference/exportsInAmbientModules1.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== external.d.ts (0 errors) ====
-    export var x: number
-    
-==== main.ts (0 errors) ====
-    declare module "M" {
-        export {x} from "external"
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsInAmbientModules2.errors.txt b/tests/baselines/reference/exportsInAmbientModules2.errors.txt
deleted file mode 100644
index 2e7d3fd651591..0000000000000
--- a/tests/baselines/reference/exportsInAmbientModules2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== external.d.ts (0 errors) ====
-    export default class C {}
-    
-==== main.ts (0 errors) ====
-    declare module "M" {
-        export * from "external"
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
index e5ae57f6d72e5..986f220e6572f 100644
--- a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
+++ b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
@@ -10,39 +10,6 @@ export function* foo2({ foo = yield "a" }) {
 
 //// [bar.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -90,7 +57,7 @@ function foo(_a) {
                 case 0:
                     _c = _b.foo;
                     if (!(_c === void 0)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("./bar")); })];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return require("./bar"); })];
                 case 1:
                     _d = _e.sent();
                     return [3 /*break*/, 3];
diff --git a/tests/baselines/reference/extendsUntypedModule.js b/tests/baselines/reference/extendsUntypedModule.js
index 03477b3e73b52..c28041bb52dd6 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -29,12 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.A = void 0;
-var foo_1 = __importDefault(require("foo"));
+var foo_1 = require("foo");
 var A = /** @class */ (function (_super) {
     __extends(A, _super);
     function A() {
diff --git a/tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt b/tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt
deleted file mode 100644
index 7974b162a5b2a..0000000000000
--- a/tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /project/a.js (0 errors) ====
-    export default "a.js";
-    
-==== /project/a.js.js (0 errors) ====
-    export default "a.js.js";
-    
-==== /project/dir/index.ts (0 errors) ====
-    export default "dir/index.ts";
-    
-==== /project/dir.js (0 errors) ====
-    export default "dir.js";
-    
-==== /project/b.ts (0 errors) ====
-    import a from "./a.js";
-    import dir from "./dir";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleAssignToVar.errors.txt b/tests/baselines/reference/externalModuleAssignToVar.errors.txt
deleted file mode 100644
index bf716b236578c..0000000000000
--- a/tests/baselines/reference/externalModuleAssignToVar.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== externalModuleAssignToVar_core.ts (0 errors) ====
-    ///<reference path='externalModuleAssignToVar_core_require.ts'/>
-    import ext = require('externalModuleAssignToVar_core_require');
-    var y1: { C: new() => ext.C; } = ext;
-    y1 = ext; // ok
-    
-    import ext2 = require('externalModuleAssignToVar_core_require2');
-    var y2: new() => ext2 = ext2;
-    y2 = ext2; // ok
-    
-    import ext3 = require('externalModuleAssignToVar_ext');
-    var y3: new () => ext3 = ext3;
-    y3 = ext3; // ok
-    
-==== externalModuleAssignToVar_ext.ts (0 errors) ====
-    class D { foo: string; }
-    export = D;
-    
-==== externalModuleAssignToVar_core_require.ts (0 errors) ====
-    export class C { bar: string; }
-    
-==== externalModuleAssignToVar_core_require2.ts (0 errors) ====
-    class C { baz: string; }
-    export = C;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index 3ec0d30530806..e77cccf260428 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -57,42 +57,9 @@ exports.x = void 0;
 exports.x = 1;
 //// [f2.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 // all mutations below are illegal and should be fixed
-var stuff = __importStar(require("./f1"));
+var stuff = require("./f1");
 var n = 'baz';
 stuff.x = 0;
 stuff['x'] = 1;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt
deleted file mode 100644
index 3a0d449b2a0cf..0000000000000
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== externalModuleReferenceOfImportDeclarationWithExportModifier_1.ts (0 errors) ====
-    export import file1 = require('externalModuleReferenceOfImportDeclarationWithExportModifier_0');
-    file1.foo();
-    
-==== externalModuleReferenceOfImportDeclarationWithExportModifier_0.ts (0 errors) ====
-    export function foo() { };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index cd4b33c46c682..dcfb29d32771f 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,17 +7,19 @@ export class C {
 }
 
 //// [fieldAndGetterWithSameName.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.C = void 0;
-var C = /** @class */ (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "x", {
-        get: function () { return 1; },
-        enumerable: false,
-        configurable: true
-    });
-    return C;
-}());
-exports.C = C;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.C = void 0;
+    var C = /** @class */ (function () {
+        function C() {
+        }
+        Object.defineProperty(C.prototype, "x", {
+            get: function () { return 1; },
+            enumerable: false,
+            configurable: true
+        });
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
deleted file mode 100644
index 71d1329b520c5..0000000000000
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class c {
-    }
-    
-==== b.ts (0 errors) ====
-    function foo() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorES6InAMDModule.errors.txt b/tests/baselines/reference/generatorES6InAMDModule.errors.txt
deleted file mode 100644
index d7717ef85086b..0000000000000
--- a/tests/baselines/reference/generatorES6InAMDModule.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== generatorES6InAMDModule.ts (0 errors) ====
-    export function* foo() {
-        yield
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorES6InAMDModule.types b/tests/baselines/reference/generatorES6InAMDModule.types
index dec20f112f4de..c2e2afd76a4e6 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.types
+++ b/tests/baselines/reference/generatorES6InAMDModule.types
@@ -7,5 +7,4 @@ export function* foo() {
 
     yield
 >yield : any
->      : ^^^
 }
diff --git a/tests/baselines/reference/genericClassesInModule2.errors.txt b/tests/baselines/reference/genericClassesInModule2.errors.txt
deleted file mode 100644
index f17d50109f04d..0000000000000
--- a/tests/baselines/reference/genericClassesInModule2.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== genericClassesInModule2.ts (0 errors) ====
-    export class A<T1>{
-        constructor( public callback: (self: A<T1>) => void) {
-            var child = new B(this);
-        }
-        AAA( callback: (self: A<T1>) => void) {
-            var child = new B(this);
-        }
-    }
-    
-    export interface C<T1>{
-        child: B<T1>;
-        (self: C<T1>): void;
-        new(callback: (self: C<T1>) => void)
-    }
-    
-    export class B<T2> {
-        constructor(public parent: T2) { }
-    }
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.errors.txt b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.errors.txt
deleted file mode 100644
index 208c4e760cb76..0000000000000
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== genericInterfaceFunctionTypeParameter.ts (0 errors) ====
-    export interface IFoo<A> { }
-    export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
-        foo(fn); // Invocation is necessary to repro (!)
-    }
-    
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index 4296ad09edb2b..49a347a33fc91 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,37 +25,42 @@ export class BuildResult<A, B, C>{
 
 
 //// [genericMemberFunction.js]
-var BuildError = /** @class */ (function () {
-    function BuildError() {
-    }
-    BuildError.prototype.parent = function () {
-        return undefined;
-    };
-    return BuildError;
-}());
-export { BuildError };
-var FileWithErrors = /** @class */ (function () {
-    function FileWithErrors() {
-    }
-    FileWithErrors.prototype.errors = function () {
-        return undefined;
-    };
-    FileWithErrors.prototype.parent = function () {
-        return undefined;
-    };
-    return FileWithErrors;
-}());
-export { FileWithErrors };
-var BuildResult = /** @class */ (function () {
-    function BuildResult() {
-    }
-    BuildResult.prototype.merge = function (other) {
-        var _this = this;
-        a.b.c.d.e.f.g = 0;
-        removedFiles.forEach(function (each) {
-            _this.removeFile(each);
-        });
-    };
-    return BuildResult;
-}());
-export { BuildResult };
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.BuildResult = exports.FileWithErrors = exports.BuildError = void 0;
+    var BuildError = /** @class */ (function () {
+        function BuildError() {
+        }
+        BuildError.prototype.parent = function () {
+            return undefined;
+        };
+        return BuildError;
+    }());
+    exports.BuildError = BuildError;
+    var FileWithErrors = /** @class */ (function () {
+        function FileWithErrors() {
+        }
+        FileWithErrors.prototype.errors = function () {
+            return undefined;
+        };
+        FileWithErrors.prototype.parent = function () {
+            return undefined;
+        };
+        return FileWithErrors;
+    }());
+    exports.FileWithErrors = FileWithErrors;
+    var BuildResult = /** @class */ (function () {
+        function BuildResult() {
+        }
+        BuildResult.prototype.merge = function (other) {
+            var _this = this;
+            a.b.c.d.e.f.g = 0;
+            removedFiles.forEach(function (each) {
+                _this.removeFile(each);
+            });
+        };
+        return BuildResult;
+    }());
+    exports.BuildResult = BuildResult;
+});
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt
index 8bdc02cdf3b76..2e2efb0b33045 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 genericRecursiveImplicitConstructorErrors1.ts(9,49): error TS2314: Generic type 'PullTypeSymbol<A, B, C>' requires 3 type argument(s).
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== genericRecursiveImplicitConstructorErrors1.ts (1 errors) ====
     export declare namespace TypeScript {
       class PullSymbol { }
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 829b50def3b37..029c0ad38a5cd 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,18 +11,20 @@ export class DbSet<T> {
 
 
 //// [genericReturnTypeFromGetter1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbSet = void 0;
-var DbSet = /** @class */ (function () {
-    function DbSet() {
-    }
-    Object.defineProperty(DbSet.prototype, "entityType", {
-        get: function () { return this._entityType; } // used to ICE without return type annotation
-        ,
-        enumerable: false,
-        configurable: true
-    });
-    return DbSet;
-}());
-exports.DbSet = DbSet;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.DbSet = void 0;
+    var DbSet = /** @class */ (function () {
+        function DbSet() {
+        }
+        Object.defineProperty(DbSet.prototype, "entityType", {
+            get: function () { return this._entityType; } // used to ICE without return type annotation
+            ,
+            enumerable: false,
+            configurable: true
+        });
+        return DbSet;
+    }());
+    exports.DbSet = DbSet;
+});
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt b/tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt
deleted file mode 100644
index a1058a1f87dd2..0000000000000
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== genericTypeWithMultipleBases2.ts (0 errors) ====
-    export interface I1 {
-        m1: () => void;
-    }
-     
-    export interface I2 {
-        m2: () => void;
-    }
-     
-    export interface I3<T> extends I2, I1 {
-        p1: T;
-    }
-     
-    var x: I3<number>;
-    x.p1;
-    x.m1();
-    x.m2();
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.errors.txt b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.errors.txt
deleted file mode 100644
index a24f0f4bdf5da..0000000000000
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== genericWithIndexerOfTypeParameterType2.ts (0 errors) ====
-    export class Collection<TItem extends CollectionItem> {
-        _itemsByKey: { [key: string]: TItem; };
-    }
-    
-    export class List extends Collection<ListItem>{
-        Bar() {}
-    }
-    
-    export class CollectionItem {}
-    
-    export class ListItem extends CollectionItem {
-        __isNew: boolean;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index fc1c523eb58e2..793991a83e987 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,277 +684,25 @@ export declare namespace eaM {
 }
 
 //// [giant.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.eM = exports.eC = exports.eV = void 0;
-exports.eF = eF;
-/*
-    Prefixes
-    p -> public
-    r -> private
-    i -> import
-    e -> export
-    a -> ambient
-    t -> static
-    s -> set
-    g -> get
-
-    MAX DEPTH 3 LEVELS
-*/
-var p = "propName";
-var V;
-function F() { }
-;
-var C = /** @class */ (function () {
-    function C() {
-    }
-    C.prototype.pF = function () { };
-    C.prototype.rF = function () { };
-    C.prototype.pgF = function () { };
-    Object.defineProperty(C.prototype, "pgF", {
-        get: function () { },
-        enumerable: false,
-        configurable: true
-    });
-    C.prototype.psF = function (param) { };
-    Object.defineProperty(C.prototype, "psF", {
-        set: function (param) { },
-        enumerable: false,
-        configurable: true
-    });
-    C.prototype.rgF = function () { };
-    Object.defineProperty(C.prototype, "rgF", {
-        get: function () { },
-        enumerable: false,
-        configurable: true
-    });
-    C.prototype.rsF = function (param) { };
-    Object.defineProperty(C.prototype, "rsF", {
-        set: function (param) { },
-        enumerable: false,
-        configurable: true
-    });
-    C.tF = function () { };
-    C.tsF = function (param) { };
-    Object.defineProperty(C, "tsF", {
-        set: function (param) { },
-        enumerable: false,
-        configurable: true
-    });
-    C.tgF = function () { };
-    Object.defineProperty(C, "tgF", {
-        get: function () { },
-        enumerable: false,
-        configurable: true
-    });
-    return C;
-}());
-var M;
-(function (M_1) {
-    var V;
-    function F() { }
-    ;
-    var C = /** @class */ (function () {
-        function C() {
-        }
-        C.prototype.pF = function () { };
-        C.prototype.rF = function () { };
-        C.prototype.pgF = function () { };
-        Object.defineProperty(C.prototype, "pgF", {
-            get: function () { },
-            enumerable: false,
-            configurable: true
-        });
-        C.prototype.psF = function (param) { };
-        Object.defineProperty(C.prototype, "psF", {
-            set: function (param) { },
-            enumerable: false,
-            configurable: true
-        });
-        C.prototype.rgF = function () { };
-        Object.defineProperty(C.prototype, "rgF", {
-            get: function () { },
-            enumerable: false,
-            configurable: true
-        });
-        C.prototype.rsF = function (param) { };
-        Object.defineProperty(C.prototype, "rsF", {
-            set: function (param) { },
-            enumerable: false,
-            configurable: true
-        });
-        C.tF = function () { };
-        C.tsF = function (param) { };
-        Object.defineProperty(C, "tsF", {
-            set: function (param) { },
-            enumerable: false,
-            configurable: true
-        });
-        C.tgF = function () { };
-        Object.defineProperty(C, "tgF", {
-            get: function () { },
-            enumerable: false,
-            configurable: true
-        });
-        return C;
-    }());
-    var M;
-    (function (M) {
-        var V;
-        function F() { }
-        ;
-        var C = /** @class */ (function () {
-            function C() {
-            }
-            return C;
-        }());
-        ;
-        ;
-        ;
-        function eF() { }
-        M.eF = eF;
-        ;
-        var eC = /** @class */ (function () {
-            function eC() {
-            }
-            return eC;
-        }());
-        M.eC = eC;
-        ;
-        ;
-        ;
-        ;
-        ;
-        ;
-    })(M || (M = {}));
-    function eF() { }
-    M_1.eF = eF;
-    ;
-    var eC = /** @class */ (function () {
-        function eC() {
-        }
-        eC.prototype.pF = function () { };
-        eC.prototype.rF = function () { };
-        eC.prototype.pgF = function () { };
-        Object.defineProperty(eC.prototype, "pgF", {
-            get: function () { },
-            enumerable: false,
-            configurable: true
-        });
-        eC.prototype.psF = function (param) { };
-        Object.defineProperty(eC.prototype, "psF", {
-            set: function (param) { },
-            enumerable: false,
-            configurable: true
-        });
-        eC.prototype.rgF = function () { };
-        Object.defineProperty(eC.prototype, "rgF", {
-            get: function () { },
-            enumerable: false,
-            configurable: true
-        });
-        eC.prototype.rsF = function (param) { };
-        Object.defineProperty(eC.prototype, "rsF", {
-            set: function (param) { },
-            enumerable: false,
-            configurable: true
-        });
-        eC.tF = function () { };
-        eC.tsF = function (param) { };
-        Object.defineProperty(eC, "tsF", {
-            set: function (param) { },
-            enumerable: false,
-            configurable: true
-        });
-        eC.tgF = function () { };
-        Object.defineProperty(eC, "tgF", {
-            get: function () { },
-            enumerable: false,
-            configurable: true
-        });
-        return eC;
-    }());
-    M_1.eC = eC;
-    var eM;
-    (function (eM) {
-        var V;
-        function F() { }
-        ;
-        var C = /** @class */ (function () {
-            function C() {
-            }
-            return C;
-        }());
-        ;
-        ;
-        ;
-        function eF() { }
-        eM.eF = eF;
-        ;
-        var eC = /** @class */ (function () {
-            function eC() {
-            }
-            return eC;
-        }());
-        eM.eC = eC;
-        ;
-        ;
-        ;
-        ;
-        ;
-        ;
-    })(eM = M_1.eM || (M_1.eM = {}));
-    ;
-})(M || (M = {}));
-function eF() { }
-;
-var eC = /** @class */ (function () {
-    function eC() {
-    }
-    eC.prototype.pF = function () { };
-    eC.prototype.rF = function () { };
-    eC.prototype.pgF = function () { };
-    Object.defineProperty(eC.prototype, "pgF", {
-        get: function () { },
-        enumerable: false,
-        configurable: true
-    });
-    eC.prototype.psF = function (param) { };
-    Object.defineProperty(eC.prototype, "psF", {
-        set: function (param) { },
-        enumerable: false,
-        configurable: true
-    });
-    eC.prototype.rgF = function () { };
-    Object.defineProperty(eC.prototype, "rgF", {
-        get: function () { },
-        enumerable: false,
-        configurable: true
-    });
-    eC.prototype.rsF = function (param) { };
-    Object.defineProperty(eC.prototype, "rsF", {
-        set: function (param) { },
-        enumerable: false,
-        configurable: true
-    });
-    eC.tF = function () { };
-    eC.tsF = function (param) { };
-    Object.defineProperty(eC, "tsF", {
-        set: function (param) { },
-        enumerable: false,
-        configurable: true
-    });
-    eC.tgF = function () { };
-    Object.defineProperty(eC, "tgF", {
-        get: function () { },
-        enumerable: false,
-        configurable: true
-    });
-    return eC;
-}());
-exports.eC = eC;
-var eM;
-(function (eM_1) {
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.eM = exports.eC = exports.eV = void 0;
+    exports.eF = eF;
+    /*
+        Prefixes
+        p -> public
+        r -> private
+        i -> import
+        e -> export
+        a -> ambient
+        t -> static
+        s -> set
+        g -> get
+    
+        MAX DEPTH 3 LEVELS
+    */
+    var p = "propName";
     var V;
     function F() { }
     ;
@@ -1003,36 +751,163 @@ var eM;
         return C;
     }());
     var M;
-    (function (M) {
+    (function (M_1) {
         var V;
         function F() { }
         ;
         var C = /** @class */ (function () {
             function C() {
             }
+            C.prototype.pF = function () { };
+            C.prototype.rF = function () { };
+            C.prototype.pgF = function () { };
+            Object.defineProperty(C.prototype, "pgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            C.prototype.psF = function (param) { };
+            Object.defineProperty(C.prototype, "psF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            C.prototype.rgF = function () { };
+            Object.defineProperty(C.prototype, "rgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            C.prototype.rsF = function (param) { };
+            Object.defineProperty(C.prototype, "rsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            C.tF = function () { };
+            C.tsF = function (param) { };
+            Object.defineProperty(C, "tsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            C.tgF = function () { };
+            Object.defineProperty(C, "tgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
             return C;
         }());
-        ;
-        ;
-        ;
+        var M;
+        (function (M) {
+            var V;
+            function F() { }
+            ;
+            var C = /** @class */ (function () {
+                function C() {
+                }
+                return C;
+            }());
+            ;
+            ;
+            ;
+            function eF() { }
+            M.eF = eF;
+            ;
+            var eC = /** @class */ (function () {
+                function eC() {
+                }
+                return eC;
+            }());
+            M.eC = eC;
+            ;
+            ;
+            ;
+            ;
+            ;
+            ;
+        })(M || (M = {}));
         function eF() { }
-        M.eF = eF;
+        M_1.eF = eF;
         ;
         var eC = /** @class */ (function () {
             function eC() {
             }
+            eC.prototype.pF = function () { };
+            eC.prototype.rF = function () { };
+            eC.prototype.pgF = function () { };
+            Object.defineProperty(eC.prototype, "pgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.prototype.psF = function (param) { };
+            Object.defineProperty(eC.prototype, "psF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.prototype.rgF = function () { };
+            Object.defineProperty(eC.prototype, "rgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.prototype.rsF = function (param) { };
+            Object.defineProperty(eC.prototype, "rsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.tF = function () { };
+            eC.tsF = function (param) { };
+            Object.defineProperty(eC, "tsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.tgF = function () { };
+            Object.defineProperty(eC, "tgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
             return eC;
         }());
-        M.eC = eC;
-        ;
-        ;
-        ;
-        ;
-        ;
+        M_1.eC = eC;
+        var eM;
+        (function (eM) {
+            var V;
+            function F() { }
+            ;
+            var C = /** @class */ (function () {
+                function C() {
+                }
+                return C;
+            }());
+            ;
+            ;
+            ;
+            function eF() { }
+            eM.eF = eF;
+            ;
+            var eC = /** @class */ (function () {
+                function eC() {
+                }
+                return eC;
+            }());
+            eM.eC = eC;
+            ;
+            ;
+            ;
+            ;
+            ;
+            ;
+        })(eM = M_1.eM || (M_1.eM = {}));
         ;
     })(M || (M = {}));
     function eF() { }
-    eM_1.eF = eF;
     ;
     var eC = /** @class */ (function () {
         function eC() {
@@ -1078,39 +953,166 @@ var eM;
         });
         return eC;
     }());
-    eM_1.eC = eC;
+    exports.eC = eC;
     var eM;
-    (function (eM) {
+    (function (eM_1) {
         var V;
         function F() { }
         ;
         var C = /** @class */ (function () {
             function C() {
             }
+            C.prototype.pF = function () { };
+            C.prototype.rF = function () { };
+            C.prototype.pgF = function () { };
+            Object.defineProperty(C.prototype, "pgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            C.prototype.psF = function (param) { };
+            Object.defineProperty(C.prototype, "psF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            C.prototype.rgF = function () { };
+            Object.defineProperty(C.prototype, "rgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            C.prototype.rsF = function (param) { };
+            Object.defineProperty(C.prototype, "rsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            C.tF = function () { };
+            C.tsF = function (param) { };
+            Object.defineProperty(C, "tsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            C.tgF = function () { };
+            Object.defineProperty(C, "tgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
             return C;
         }());
-        ;
-        ;
-        ;
+        var M;
+        (function (M) {
+            var V;
+            function F() { }
+            ;
+            var C = /** @class */ (function () {
+                function C() {
+                }
+                return C;
+            }());
+            ;
+            ;
+            ;
+            function eF() { }
+            M.eF = eF;
+            ;
+            var eC = /** @class */ (function () {
+                function eC() {
+                }
+                return eC;
+            }());
+            M.eC = eC;
+            ;
+            ;
+            ;
+            ;
+            ;
+            ;
+        })(M || (M = {}));
         function eF() { }
-        eM.eF = eF;
+        eM_1.eF = eF;
         ;
         var eC = /** @class */ (function () {
             function eC() {
             }
+            eC.prototype.pF = function () { };
+            eC.prototype.rF = function () { };
+            eC.prototype.pgF = function () { };
+            Object.defineProperty(eC.prototype, "pgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.prototype.psF = function (param) { };
+            Object.defineProperty(eC.prototype, "psF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.prototype.rgF = function () { };
+            Object.defineProperty(eC.prototype, "rgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.prototype.rsF = function (param) { };
+            Object.defineProperty(eC.prototype, "rsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.tF = function () { };
+            eC.tsF = function (param) { };
+            Object.defineProperty(eC, "tsF", {
+                set: function (param) { },
+                enumerable: false,
+                configurable: true
+            });
+            eC.tgF = function () { };
+            Object.defineProperty(eC, "tgF", {
+                get: function () { },
+                enumerable: false,
+                configurable: true
+            });
             return eC;
         }());
-        eM.eC = eC;
-        ;
-        ;
-        ;
-        ;
-        ;
+        eM_1.eC = eC;
+        var eM;
+        (function (eM) {
+            var V;
+            function F() { }
+            ;
+            var C = /** @class */ (function () {
+                function C() {
+                }
+                return C;
+            }());
+            ;
+            ;
+            ;
+            function eF() { }
+            eM.eF = eF;
+            ;
+            var eC = /** @class */ (function () {
+                function eC() {
+                }
+                return eC;
+            }());
+            eM.eC = eC;
+            ;
+            ;
+            ;
+            ;
+            ;
+            ;
+        })(eM = eM_1.eM || (eM_1.eM = {}));
         ;
-    })(eM = eM_1.eM || (eM_1.eM = {}));
+    })(eM || (exports.eM = eM = {}));
     ;
-})(eM || (exports.eM = eM = {}));
-;
+});
 
 
 //// [giant.d.ts]
diff --git a/tests/baselines/reference/goToDefinitionImports.baseline.jsonc b/tests/baselines/reference/goToDefinitionImports.baseline.jsonc
index 3d473ee006a53..d9c6422c06023 100644
--- a/tests/baselines/reference/goToDefinitionImports.baseline.jsonc
+++ b/tests/baselines/reference/goToDefinitionImports.baseline.jsonc
@@ -42,7 +42,7 @@
    {
     "kind": "function",
     "name": "f",
-    "containerName": "\"/a\"",
+    "containerName": "a",
     "isLocal": false,
     "isAmbient": false,
     "unverified": false
@@ -70,7 +70,7 @@
    {
     "kind": "const",
     "name": "x",
-    "containerName": "\"/a\"",
+    "containerName": "a",
     "isLocal": false,
     "isAmbient": false,
     "unverified": false
diff --git a/tests/baselines/reference/ignoredJsxAttributes.js b/tests/baselines/reference/ignoredJsxAttributes.js
index e25687859eccf..81a21f7dd9a30 100644
--- a/tests/baselines/reference/ignoredJsxAttributes.js
+++ b/tests/baselines/reference/ignoredJsxAttributes.js
@@ -26,42 +26,9 @@ let x2 = <Yadda bar="hello" data-yadda={42}/>;  // Error
 //// [ignoredJsxAttributes.js]
 "use strict";
 /// <reference path="react16.d.ts" />
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 // Repro from #44797
-var React = __importStar(require("react"));
+var React = require("react");
 var props = {
     foo: "",
     "data-yadda": 42, // Error
diff --git a/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt b/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt
index 0651e0692d375..7a67132f7f441 100644
--- a/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt
+++ b/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt
@@ -1,9 +1,7 @@
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     export const _ = 0;
     
diff --git a/tests/baselines/reference/impliedNodeFormatEmit1(module=system).errors.txt b/tests/baselines/reference/impliedNodeFormatEmit1(module=system).errors.txt
index 5977c517fad8c..f14c00104a9b4 100644
--- a/tests/baselines/reference/impliedNodeFormatEmit1(module=system).errors.txt
+++ b/tests/baselines/reference/impliedNodeFormatEmit1(module=system).errors.txt
@@ -1,11 +1,9 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     export const _ = 0;
     
diff --git a/tests/baselines/reference/impliedNodeFormatEmit1(module=umd).errors.txt b/tests/baselines/reference/impliedNodeFormatEmit1(module=umd).errors.txt
index dcaba12d2bfd4..f14c00104a9b4 100644
--- a/tests/baselines/reference/impliedNodeFormatEmit1(module=umd).errors.txt
+++ b/tests/baselines/reference/impliedNodeFormatEmit1(module=umd).errors.txt
@@ -1,11 +1,9 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     export const _ = 0;
     
diff --git a/tests/baselines/reference/importAssertion1(module=commonjs).js b/tests/baselines/reference/importAssertion1(module=commonjs).js
index a927686c3499c..233a0a293b6e5 100644
--- a/tests/baselines/reference/importAssertion1(module=commonjs).js
+++ b/tests/baselines/reference/importAssertion1(module=commonjs).js
@@ -43,43 +43,10 @@ exports.a = 1;
 exports.b = 2;
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./0");
 const _0_1 = require("./0");
-const foo = __importStar(require("./0"));
+const foo = require("./0");
 _0_1.a;
 _0_1.b;
 foo.a;
@@ -94,48 +61,15 @@ _0_1.b;
 _0_2.a;
 _0_2.b;
 //// [3.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-const a = Promise.resolve().then(() => __importStar(require('./0')));
-const b = Promise.resolve().then(() => __importStar(require('./0')));
-const c = Promise.resolve().then(() => __importStar(require('./0')));
-const d = Promise.resolve().then(() => __importStar(require('./0')));
-const dd = Promise.resolve().then(() => __importStar(require('./0')));
-const e = Promise.resolve().then(() => __importStar(require('./0')));
-const f = Promise.resolve().then(() => __importStar(require()));
-const g = Promise.resolve().then(() => __importStar(require('./0')));
-const h = Promise.resolve().then(() => __importStar(require('./0')));
+const a = Promise.resolve().then(() => require('./0'));
+const b = Promise.resolve().then(() => require('./0'));
+const c = Promise.resolve().then(() => require('./0'));
+const d = Promise.resolve().then(() => require('./0'));
+const dd = Promise.resolve().then(() => require('./0'));
+const e = Promise.resolve().then(() => require('./0'));
+const f = Promise.resolve().then(() => require());
+const g = Promise.resolve().then(() => require('./0'));
+const h = Promise.resolve().then(() => require('./0'));
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/importAssertion2(module=commonjs).js b/tests/baselines/reference/importAssertion2(module=commonjs).js
index a3c51d1f8513f..c05cbe462912c 100644
--- a/tests/baselines/reference/importAssertion2(module=commonjs).js
+++ b/tests/baselines/reference/importAssertion2(module=commonjs).js
@@ -34,38 +34,16 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ns = exports.b = exports.a = void 0;
 var _0_1 = require("./0");
 Object.defineProperty(exports, "a", { enumerable: true, get: function () { return _0_1.a; } });
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return _0_1.b; } });
 __exportStar(require("./0"), exports);
-exports.ns = __importStar(require("./0"));
+exports.ns = require("./0");
 //// [2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importAttributes1(module=commonjs).js b/tests/baselines/reference/importAttributes1(module=commonjs).js
index 3825f530c3e95..efa8ccd637c10 100644
--- a/tests/baselines/reference/importAttributes1(module=commonjs).js
+++ b/tests/baselines/reference/importAttributes1(module=commonjs).js
@@ -40,43 +40,10 @@ exports.a = 1;
 exports.b = 2;
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./0");
 const _0_1 = require("./0");
-const foo = __importStar(require("./0"));
+const foo = require("./0");
 _0_1.a;
 _0_1.b;
 foo.a;
@@ -91,48 +58,15 @@ _0_1.b;
 _0_2.a;
 _0_2.b;
 //// [3.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-const a = Promise.resolve().then(() => __importStar(require('./0')));
-const b = Promise.resolve().then(() => __importStar(require('./0')));
-const c = Promise.resolve().then(() => __importStar(require('./0')));
-const d = Promise.resolve().then(() => __importStar(require('./0')));
-const dd = Promise.resolve().then(() => __importStar(require('./0')));
-const e = Promise.resolve().then(() => __importStar(require('./0')));
-const f = Promise.resolve().then(() => __importStar(require()));
-const g = Promise.resolve().then(() => __importStar(require('./0')));
-const h = Promise.resolve().then(() => __importStar(require('./0')));
+const a = Promise.resolve().then(() => require('./0'));
+const b = Promise.resolve().then(() => require('./0'));
+const c = Promise.resolve().then(() => require('./0'));
+const d = Promise.resolve().then(() => require('./0'));
+const dd = Promise.resolve().then(() => require('./0'));
+const e = Promise.resolve().then(() => require('./0'));
+const f = Promise.resolve().then(() => require());
+const g = Promise.resolve().then(() => require('./0'));
+const h = Promise.resolve().then(() => require('./0'));
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/importAttributes2(module=commonjs).js b/tests/baselines/reference/importAttributes2(module=commonjs).js
index 0df07d2bbd057..98da1bd8edc06 100644
--- a/tests/baselines/reference/importAttributes2(module=commonjs).js
+++ b/tests/baselines/reference/importAttributes2(module=commonjs).js
@@ -34,38 +34,16 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ns = exports.b = exports.a = void 0;
 var _0_1 = require("./0");
 Object.defineProperty(exports, "a", { enumerable: true, get: function () { return _0_1.a; } });
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return _0_1.b; } });
 __exportStar(require("./0"), exports);
-exports.ns = __importStar(require("./0"));
+exports.ns = require("./0");
 //// [2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importAttributes9.symbols b/tests/baselines/reference/importAttributes9.symbols
index 7aa4fb1cc94bd..bb0975afa8dc0 100644
--- a/tests/baselines/reference/importAttributes9.symbols
+++ b/tests/baselines/reference/importAttributes9.symbols
@@ -26,7 +26,7 @@ async function f() {
 >f : Symbol(f, Decl(b.ts, 7, 8))
 
     await import("./a", {
->"./a" : Symbol("a", Decl(a.ts, 0, 0))
+>"./a" : Symbol(ns, Decl(a.ts, 0, 0))
 
         with: {
 >with : Symbol(with, Decl(b.ts, 10, 25))
diff --git a/tests/baselines/reference/importAttributes9.types b/tests/baselines/reference/importAttributes9.types
index fb948b5da1ab7..f3cbc0e848f5b 100644
--- a/tests/baselines/reference/importAttributes9.types
+++ b/tests/baselines/reference/importAttributes9.types
@@ -34,10 +34,10 @@ async function f() {
 >  : ^^^^^^^^^^^^^^^^^^^
 
     await import("./a", {
->await import("./a", {        with: {            type: "not-json",        },    }) : typeof import("a")
->                                                                                  : ^^^^^^^^^^^^^^^^^^
->import("./a", {        with: {            type: "not-json",        },    }) : Promise<typeof import("a")>
->                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>await import("./a", {        with: {            type: "not-json",        },    }) : typeof ns
+>                                                                                  : ^^^^^^^^^
+>import("./a", {        with: {            type: "not-json",        },    }) : Promise<typeof ns>
+>                                                                            : ^^^^^^^^^^^^^^^^^^
 >"./a" : "./a"
 >      : ^^^^^
 >{        with: {            type: "not-json",        },    } : { with: { type: "not-json"; }; }
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt
deleted file mode 100644
index e9e9f0fcf2e97..0000000000000
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    export async function fn() {
-        const req = await import('./test') // ONE
-    }
-    
-    export class cl1 {
-        public async m() {
-            const req = await import('./test') // TWO
-        }
-    }
-    
-    export const obj = {
-        m: async () => {
-            const req = await import('./test') // THREE
-        }
-    }
-    
-    export class cl2 {
-        public p = {
-            m: async () => {
-                const req = await import('./test') // FOUR
-            }
-        }
-    }
-    
-    export const l = async () => {
-        const req = await import('./test') // FIVE
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
index f5080bd001cf7..4a458837a45ac 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
@@ -31,39 +31,6 @@ export const l = async () => {
 
 
 //// [test.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -110,7 +77,7 @@ define(["require", "exports"], function (require, exports) {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, new Promise(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); }).then(__importStar)]; // ONE
+                    case 0: return [4 /*yield*/, new Promise(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); })]; // ONE
                     case 1:
                         req = _a.sent() // ONE
                         ;
@@ -127,7 +94,7 @@ define(["require", "exports"], function (require, exports) {
                 var req;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); }).then(__importStar)]; // TWO
+                        case 0: return [4 /*yield*/, new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); })]; // TWO
                         case 1:
                             req = _a.sent() // TWO
                             ;
@@ -144,7 +111,7 @@ define(["require", "exports"], function (require, exports) {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); }).then(__importStar)]; // THREE
+                    case 0: return [4 /*yield*/, new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); })]; // THREE
                     case 1:
                         req = _a.sent() // THREE
                         ;
@@ -161,7 +128,7 @@ define(["require", "exports"], function (require, exports) {
                     var req;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0: return [4 /*yield*/, new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); }).then(__importStar)]; // FOUR
+                            case 0: return [4 /*yield*/, new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); })]; // FOUR
                             case 1:
                                 req = _a.sent() // FOUR
                                 ;
@@ -178,7 +145,7 @@ define(["require", "exports"], function (require, exports) {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); }).then(__importStar)]; // FIVE
+                case 0: return [4 /*yield*/, new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); })]; // FIVE
                 case 1:
                     req = _a.sent() // FIVE
                     ;
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
index d4709a9e0c997..4f2657547fe75 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
@@ -32,39 +32,6 @@ export const l = async () => {
 
 //// [test.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -109,7 +76,7 @@ function fn() {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./test')); })]; // ONE
+                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require('./test'); })]; // ONE
                 case 1:
                     req = _a.sent() // ONE
                     ;
@@ -126,7 +93,7 @@ var cl1 = /** @class */ (function () {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./test')); })]; // TWO
+                    case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require('./test'); })]; // TWO
                     case 1:
                         req = _a.sent() // TWO
                         ;
@@ -143,7 +110,7 @@ exports.obj = {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./test')); })]; // THREE
+                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require('./test'); })]; // THREE
                 case 1:
                     req = _a.sent() // THREE
                     ;
@@ -160,7 +127,7 @@ var cl2 = /** @class */ (function () {
                 var req;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./test')); })]; // FOUR
+                        case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require('./test'); })]; // FOUR
                         case 1:
                             req = _a.sent() // FOUR
                             ;
@@ -177,7 +144,7 @@ var l = function () { return __awaiter(void 0, void 0, void 0, function () {
     var req;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./test')); })]; // FIVE
+            case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require('./test'); })]; // FIVE
             case 1:
                 req = _a.sent() // FIVE
                 ;
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt
deleted file mode 100644
index 8dd6a353a2554..0000000000000
--- a/tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    export async function fn() {
-        const req = await import('./test') // ONE
-    }
-    
-    export class cl1 {
-        public async m() {
-            const req = await import('./test') // TWO
-        }
-    }
-    
-    export const obj = {
-        m: async () => {
-            const req = await import('./test') // THREE
-        }
-    }
-    
-    export class cl2 {
-        public p = {
-            m: async () => {
-                const req = await import('./test') // FOUR
-            }
-        }
-    }
-    
-    export const l = async () => {
-        const req = await import('./test') // FIVE
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES5UMD.errors.txt
deleted file mode 100644
index 346e820da515c..0000000000000
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    export async function fn() {
-        const req = await import('./test') // ONE
-    }
-    
-    export class cl1 {
-        public async m() {
-            const req = await import('./test') // TWO
-        }
-    }
-    
-    export const obj = {
-        m: async () => {
-            const req = await import('./test') // THREE
-        }
-    }
-    
-    export class cl2 {
-        public p = {
-            m: async () => {
-                const req = await import('./test') // FOUR
-            }
-        }
-    }
-    
-    export const l = async () => {
-        const req = await import('./test') // FIVE
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
index f3a87b1619c3d..799fb08ad48dc 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
@@ -31,39 +31,6 @@ export const l = async () => {
 
 
 //// [test.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -119,7 +86,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return __importStar(require('./test')); }) : new Promise(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); }).then(__importStar)]; // ONE
+                    case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); })]; // ONE
                     case 1:
                         req = _a.sent() // ONE
                         ;
@@ -136,7 +103,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 var req;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return __importStar(require('./test')); }) : new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); }).then(__importStar)]; // TWO
+                        case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); })]; // TWO
                         case 1:
                             req = _a.sent() // TWO
                             ;
@@ -153,7 +120,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return __importStar(require('./test')); }) : new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); }).then(__importStar)]; // THREE
+                    case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); })]; // THREE
                     case 1:
                         req = _a.sent() // THREE
                         ;
@@ -170,7 +137,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                     var req;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return __importStar(require('./test')); }) : new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); }).then(__importStar)]; // FOUR
+                            case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); })]; // FOUR
                             case 1:
                                 req = _a.sent() // FOUR
                                 ;
@@ -187,7 +154,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return __importStar(require('./test')); }) : new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); }).then(__importStar)]; // FIVE
+                case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); })]; // FIVE
                 case 1:
                     req = _a.sent() // FIVE
                     ;
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt
deleted file mode 100644
index e9e9f0fcf2e97..0000000000000
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    export async function fn() {
-        const req = await import('./test') // ONE
-    }
-    
-    export class cl1 {
-        public async m() {
-            const req = await import('./test') // TWO
-        }
-    }
-    
-    export const obj = {
-        m: async () => {
-            const req = await import('./test') // THREE
-        }
-    }
-    
-    export class cl2 {
-        public p = {
-            m: async () => {
-                const req = await import('./test') // FOUR
-            }
-        }
-    }
-    
-    export const l = async () => {
-        const req = await import('./test') // FIVE
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
index 34f8abf365b6e..21b14853ff444 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
@@ -31,39 +31,6 @@ export const l = async () => {
 
 
 //// [test.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -80,34 +47,34 @@ define(["require", "exports"], function (require, exports) {
     exports.fn = fn;
     function fn() {
         return __awaiter(this, void 0, void 0, function* () {
-            const req = yield new Promise((resolve_1, reject_1) => { require(['./test'], resolve_1, reject_1); }).then(__importStar); // ONE
+            const req = yield new Promise((resolve_1, reject_1) => { require(['./test'], resolve_1, reject_1); }); // ONE
         });
     }
     class cl1 {
         m() {
             return __awaiter(this, void 0, void 0, function* () {
-                const req = yield new Promise((resolve_2, reject_2) => { require(['./test'], resolve_2, reject_2); }).then(__importStar); // TWO
+                const req = yield new Promise((resolve_2, reject_2) => { require(['./test'], resolve_2, reject_2); }); // TWO
             });
         }
     }
     exports.cl1 = cl1;
     exports.obj = {
         m: () => __awaiter(void 0, void 0, void 0, function* () {
-            const req = yield new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }).then(__importStar); // THREE
+            const req = yield new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }); // THREE
         })
     };
     class cl2 {
         constructor() {
             this.p = {
                 m: () => __awaiter(this, void 0, void 0, function* () {
-                    const req = yield new Promise((resolve_4, reject_4) => { require(['./test'], resolve_4, reject_4); }).then(__importStar); // FOUR
+                    const req = yield new Promise((resolve_4, reject_4) => { require(['./test'], resolve_4, reject_4); }); // FOUR
                 })
             };
         }
     }
     exports.cl2 = cl2;
     const l = () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }).then(__importStar); // FIVE
+        const req = yield new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }); // FIVE
     });
     exports.l = l;
 });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
index 6dfda64181593..b425efa2287ef 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
@@ -32,39 +32,6 @@ export const l = async () => {
 
 //// [test.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -79,33 +46,33 @@ exports.l = exports.cl2 = exports.obj = exports.cl1 = void 0;
 exports.fn = fn;
 function fn() {
     return __awaiter(this, void 0, void 0, function* () {
-        const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // ONE
+        const req = yield Promise.resolve().then(() => require('./test')); // ONE
     });
 }
 class cl1 {
     m() {
         return __awaiter(this, void 0, void 0, function* () {
-            const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // TWO
+            const req = yield Promise.resolve().then(() => require('./test')); // TWO
         });
     }
 }
 exports.cl1 = cl1;
 exports.obj = {
     m: () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // THREE
+        const req = yield Promise.resolve().then(() => require('./test')); // THREE
     })
 };
 class cl2 {
     constructor() {
         this.p = {
             m: () => __awaiter(this, void 0, void 0, function* () {
-                const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // FOUR
+                const req = yield Promise.resolve().then(() => require('./test')); // FOUR
             })
         };
     }
 }
 exports.cl2 = cl2;
 const l = () => __awaiter(void 0, void 0, void 0, function* () {
-    const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // FIVE
+    const req = yield Promise.resolve().then(() => require('./test')); // FIVE
 });
 exports.l = l;
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt
deleted file mode 100644
index 8dd6a353a2554..0000000000000
--- a/tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    export async function fn() {
-        const req = await import('./test') // ONE
-    }
-    
-    export class cl1 {
-        public async m() {
-            const req = await import('./test') // TWO
-        }
-    }
-    
-    export const obj = {
-        m: async () => {
-            const req = await import('./test') // THREE
-        }
-    }
-    
-    export class cl2 {
-        public p = {
-            m: async () => {
-                const req = await import('./test') // FOUR
-            }
-        }
-    }
-    
-    export const l = async () => {
-        const req = await import('./test') // FIVE
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES6UMD.errors.txt
deleted file mode 100644
index 346e820da515c..0000000000000
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    export async function fn() {
-        const req = await import('./test') // ONE
-    }
-    
-    export class cl1 {
-        public async m() {
-            const req = await import('./test') // TWO
-        }
-    }
-    
-    export const obj = {
-        m: async () => {
-            const req = await import('./test') // THREE
-        }
-    }
-    
-    export class cl2 {
-        public p = {
-            m: async () => {
-                const req = await import('./test') // FOUR
-            }
-        }
-    }
-    
-    export const l = async () => {
-        const req = await import('./test') // FIVE
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
index 5dfb48d66b575..b87a1e62c758e 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
@@ -31,39 +31,6 @@ export const l = async () => {
 
 
 //// [test.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -89,34 +56,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     exports.fn = fn;
     function fn() {
         return __awaiter(this, void 0, void 0, function* () {
-            const req = yield __syncRequire ? Promise.resolve().then(() => __importStar(require('./test'))) : new Promise((resolve_1, reject_1) => { require(['./test'], resolve_1, reject_1); }).then(__importStar); // ONE
+            const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_1, reject_1) => { require(['./test'], resolve_1, reject_1); }); // ONE
         });
     }
     class cl1 {
         m() {
             return __awaiter(this, void 0, void 0, function* () {
-                const req = yield __syncRequire ? Promise.resolve().then(() => __importStar(require('./test'))) : new Promise((resolve_2, reject_2) => { require(['./test'], resolve_2, reject_2); }).then(__importStar); // TWO
+                const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_2, reject_2) => { require(['./test'], resolve_2, reject_2); }); // TWO
             });
         }
     }
     exports.cl1 = cl1;
     exports.obj = {
         m: () => __awaiter(void 0, void 0, void 0, function* () {
-            const req = yield __syncRequire ? Promise.resolve().then(() => __importStar(require('./test'))) : new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }).then(__importStar); // THREE
+            const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }); // THREE
         })
     };
     class cl2 {
         constructor() {
             this.p = {
                 m: () => __awaiter(this, void 0, void 0, function* () {
-                    const req = yield __syncRequire ? Promise.resolve().then(() => __importStar(require('./test'))) : new Promise((resolve_4, reject_4) => { require(['./test'], resolve_4, reject_4); }).then(__importStar); // FOUR
+                    const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_4, reject_4) => { require(['./test'], resolve_4, reject_4); }); // FOUR
                 })
             };
         }
     }
     exports.cl2 = cl2;
     const l = () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield __syncRequire ? Promise.resolve().then(() => __importStar(require('./test'))) : new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }).then(__importStar); // FIVE
+        const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }); // FIVE
     });
     exports.l = l;
 });
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.js b/tests/baselines/reference/importCallExpressionCheckReturntype1.js
index df380540201be..9b1fd4e1fdc31 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.js
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.js
@@ -31,40 +31,7 @@ class C {
 exports.C = C;
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-let p1 = Promise.resolve().then(() => __importStar(require("./defaultPath")));
-let p2 = Promise.resolve().then(() => __importStar(require("./defaultPath")));
-let p3 = Promise.resolve().then(() => __importStar(require("./defaultPath")));
+let p1 = Promise.resolve().then(() => require("./defaultPath"));
+let p2 = Promise.resolve().then(() => require("./defaultPath"));
+let p3 = Promise.resolve().then(() => require("./defaultPath"));
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit1.js b/tests/baselines/reference/importCallExpressionDeclarationEmit1.js
index ff4c5a3080921..ba9d6efaa90f4 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit1.js
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit1.js
@@ -17,45 +17,12 @@ function returnDynamicLoad(path: string) {
 }
 
 //// [importCallExpressionDeclarationEmit1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-var p0 = Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => __importStar(require(s)));
-var p1 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => __importStar(require(s)));
+Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+var p0 = Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => require(s));
+var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s));
 function returnDynamicLoad(path) {
-    return Promise.resolve(`${path}`).then(s => __importStar(require(s)));
+    return Promise.resolve(`${path}`).then(s => require(s));
 }
 
 
diff --git a/tests/baselines/reference/importCallExpressionES5AMD.errors.txt b/tests/baselines/reference/importCallExpressionES5AMD.errors.txt
deleted file mode 100644
index 31f9e39e63788..0000000000000
--- a/tests/baselines/reference/importCallExpressionES5AMD.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
-    
-    class C {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
-    
-    export class D {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionES5AMD.js b/tests/baselines/reference/importCallExpressionES5AMD.js
index c04c5308fa10a..5fe56fa61a974 100644
--- a/tests/baselines/reference/importCallExpressionES5AMD.js
+++ b/tests/baselines/reference/importCallExpressionES5AMD.js
@@ -36,57 +36,24 @@ define(["require", "exports"], function (require, exports) {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.D = exports.p2 = void 0;
-    new Promise(function (resolve_1, reject_1) { require(["./0"], resolve_1, reject_1); }).then(__importStar);
-    var p1 = new Promise(function (resolve_2, reject_2) { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+    new Promise(function (resolve_1, reject_1) { require(["./0"], resolve_1, reject_1); });
+    var p1 = new Promise(function (resolve_2, reject_2) { require(["./0"], resolve_2, reject_2); });
     p1.then(function (zero) {
         return zero.foo();
     });
-    exports.p2 = new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); }).then(__importStar);
+    exports.p2 = new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); });
     function foo() {
-        var p2 = new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+        var p2 = new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); });
     }
     var C = /** @class */ (function () {
         function C() {
         }
         C.prototype.method = function () {
-            var loadAsync = new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); }).then(__importStar);
+            var loadAsync = new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); });
         };
         return C;
     }());
@@ -94,7 +61,7 @@ define(["require", "exports"], function (require, exports) {
         function D() {
         }
         D.prototype.method = function () {
-            var loadAsync = new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); }).then(__importStar);
+            var loadAsync = new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); });
         };
         return D;
     }());
diff --git a/tests/baselines/reference/importCallExpressionES5CJS.js b/tests/baselines/reference/importCallExpressionES5CJS.js
index 5beb755c6eeb4..d7abf2f1c182c 100644
--- a/tests/baselines/reference/importCallExpressionES5CJS.js
+++ b/tests/baselines/reference/importCallExpressionES5CJS.js
@@ -35,55 +35,22 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.D = exports.p2 = void 0;
-Promise.resolve().then(function () { return __importStar(require("./0")); });
-var p1 = Promise.resolve().then(function () { return __importStar(require("./0")); });
+Promise.resolve().then(function () { return require("./0"); });
+var p1 = Promise.resolve().then(function () { return require("./0"); });
 p1.then(function (zero) {
     return zero.foo();
 });
-exports.p2 = Promise.resolve().then(function () { return __importStar(require("./0")); });
+exports.p2 = Promise.resolve().then(function () { return require("./0"); });
 function foo() {
-    var p2 = Promise.resolve().then(function () { return __importStar(require("./0")); });
+    var p2 = Promise.resolve().then(function () { return require("./0"); });
 }
 var C = /** @class */ (function () {
     function C() {
     }
     C.prototype.method = function () {
-        var loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); });
+        var loadAsync = Promise.resolve().then(function () { return require("./0"); });
     };
     return C;
 }());
@@ -91,7 +58,7 @@ var D = /** @class */ (function () {
     function D() {
     }
     D.prototype.method = function () {
-        var loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); });
+        var loadAsync = Promise.resolve().then(function () { return require("./0"); });
     };
     return D;
 }());
diff --git a/tests/baselines/reference/importCallExpressionES5System.errors.txt b/tests/baselines/reference/importCallExpressionES5System.errors.txt
deleted file mode 100644
index 0fb7315d37773..0000000000000
--- a/tests/baselines/reference/importCallExpressionES5System.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
-    
-    class C {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
-    
-    export class D {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionES5UMD.errors.txt b/tests/baselines/reference/importCallExpressionES5UMD.errors.txt
deleted file mode 100644
index ff981b39efa20..0000000000000
--- a/tests/baselines/reference/importCallExpressionES5UMD.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
-    
-    class C {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
-    
-    export class D {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionES5UMD.js b/tests/baselines/reference/importCallExpressionES5UMD.js
index df1d6884d8c3e..c3b99494dc81e 100644
--- a/tests/baselines/reference/importCallExpressionES5UMD.js
+++ b/tests/baselines/reference/importCallExpressionES5UMD.js
@@ -44,39 +44,6 @@ export class D {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -90,20 +57,20 @@ var __importStar = (this && this.__importStar) || (function () {
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.D = exports.p2 = void 0;
-    __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./0")); }) : new Promise(function (resolve_1, reject_1) { require(["./0"], resolve_1, reject_1); }).then(__importStar);
-    var p1 = __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./0")); }) : new Promise(function (resolve_2, reject_2) { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+    __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_1, reject_1) { require(["./0"], resolve_1, reject_1); });
+    var p1 = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_2, reject_2) { require(["./0"], resolve_2, reject_2); });
     p1.then(function (zero) {
         return zero.foo();
     });
-    exports.p2 = __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./0")); }) : new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); }).then(__importStar);
+    exports.p2 = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); });
     function foo() {
-        var p2 = __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./0")); }) : new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+        var p2 = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); });
     }
     var C = /** @class */ (function () {
         function C() {
         }
         C.prototype.method = function () {
-            var loadAsync = __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./0")); }) : new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); }).then(__importStar);
+            var loadAsync = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); });
         };
         return C;
     }());
@@ -111,7 +78,7 @@ var __importStar = (this && this.__importStar) || (function () {
         function D() {
         }
         D.prototype.method = function () {
-            var loadAsync = __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./0")); }) : new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); }).then(__importStar);
+            var loadAsync = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); });
         };
         return D;
     }());
diff --git a/tests/baselines/reference/importCallExpressionES6AMD.errors.txt b/tests/baselines/reference/importCallExpressionES6AMD.errors.txt
deleted file mode 100644
index 31f9e39e63788..0000000000000
--- a/tests/baselines/reference/importCallExpressionES6AMD.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
-    
-    class C {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
-    
-    export class D {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionES6AMD.js b/tests/baselines/reference/importCallExpressionES6AMD.js
index 9771a8f9c3623..53ba3fcd37590 100644
--- a/tests/baselines/reference/importCallExpressionES6AMD.js
+++ b/tests/baselines/reference/importCallExpressionES6AMD.js
@@ -36,60 +36,27 @@ define(["require", "exports"], function (require, exports) {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.D = exports.p2 = void 0;
-    new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
-    var p1 = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+    new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
+    var p1 = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
+    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
     function foo() {
-        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
     }
     class C {
         method() {
-            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
+            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
         }
     }
     class D {
         method() {
-            const loadAsync = new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); }).then(__importStar);
+            const loadAsync = new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); });
         }
     }
     exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES6CJS.js b/tests/baselines/reference/importCallExpressionES6CJS.js
index 7065853de2dc7..89ed898d92754 100644
--- a/tests/baselines/reference/importCallExpressionES6CJS.js
+++ b/tests/baselines/reference/importCallExpressionES6CJS.js
@@ -35,58 +35,25 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.D = exports.p2 = void 0;
-Promise.resolve().then(() => __importStar(require("./0")));
-var p1 = Promise.resolve().then(() => __importStar(require("./0")));
+Promise.resolve().then(() => require("./0"));
+var p1 = Promise.resolve().then(() => require("./0"));
 p1.then(zero => {
     return zero.foo();
 });
-exports.p2 = Promise.resolve().then(() => __importStar(require("./0")));
+exports.p2 = Promise.resolve().then(() => require("./0"));
 function foo() {
-    const p2 = Promise.resolve().then(() => __importStar(require("./0")));
+    const p2 = Promise.resolve().then(() => require("./0"));
 }
 class C {
     method() {
-        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
+        const loadAsync = Promise.resolve().then(() => require("./0"));
     }
 }
 class D {
     method() {
-        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
+        const loadAsync = Promise.resolve().then(() => require("./0"));
     }
 }
 exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES6System.errors.txt b/tests/baselines/reference/importCallExpressionES6System.errors.txt
deleted file mode 100644
index 0fb7315d37773..0000000000000
--- a/tests/baselines/reference/importCallExpressionES6System.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
-    
-    class C {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
-    
-    export class D {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionES6UMD.errors.txt b/tests/baselines/reference/importCallExpressionES6UMD.errors.txt
deleted file mode 100644
index ff981b39efa20..0000000000000
--- a/tests/baselines/reference/importCallExpressionES6UMD.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
-    
-    class C {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
-    
-    export class D {
-        method() {
-            const loadAsync = import ("./0");
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionES6UMD.js b/tests/baselines/reference/importCallExpressionES6UMD.js
index 5b1e122ae8940..96c664e312de0 100644
--- a/tests/baselines/reference/importCallExpressionES6UMD.js
+++ b/tests/baselines/reference/importCallExpressionES6UMD.js
@@ -44,39 +44,6 @@ export class D {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -90,23 +57,23 @@ var __importStar = (this && this.__importStar) || (function () {
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.D = exports.p2 = void 0;
-    __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
-    var p1 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+    __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
+    var p1 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
+    exports.p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
     function foo() {
-        const p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+        const p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
     }
     class C {
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
         }
     }
     class D {
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); }).then(__importStar);
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); });
         }
     }
     exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionGrammarError.js b/tests/baselines/reference/importCallExpressionGrammarError.js
index d05efe316a13f..0952ed1c7fdb9 100644
--- a/tests/baselines/reference/importCallExpressionGrammarError.js
+++ b/tests/baselines/reference/importCallExpressionGrammarError.js
@@ -12,41 +12,8 @@ const p2 = import();
 const p4 = import("pathToModule", "secondModule");
 
 //// [importCallExpressionGrammarError.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var a = ["./0"];
-Promise.resolve(`${...["PathModule"]}`).then(s => __importStar(require(s)));
-var p1 = Promise.resolve(`${...a}`).then(s => __importStar(require(s)));
-const p2 = Promise.resolve().then(() => __importStar(require()));
-const p4 = Promise.resolve().then(() => __importStar(require("pathToModule")));
+Promise.resolve(`${...["PathModule"]}`).then(s => require(s));
+var p1 = Promise.resolve(`${...a}`).then(s => require(s));
+const p2 = Promise.resolve().then(() => require());
+const p4 = Promise.resolve().then(() => require("pathToModule"));
diff --git a/tests/baselines/reference/importCallExpressionInAMD1.errors.txt b/tests/baselines/reference/importCallExpressionInAMD1.errors.txt
deleted file mode 100644
index cbb94db928731..0000000000000
--- a/tests/baselines/reference/importCallExpressionInAMD1.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInAMD1.js b/tests/baselines/reference/importCallExpressionInAMD1.js
index 7823bfb0fef33..a6d5346b22bbe 100644
--- a/tests/baselines/reference/importCallExpressionInAMD1.js
+++ b/tests/baselines/reference/importCallExpressionInAMD1.js
@@ -24,50 +24,17 @@ define(["require", "exports"], function (require, exports) {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.p2 = void 0;
-    new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
-    var p1 = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+    new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
+    var p1 = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
+    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
     function foo() {
-        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.errors.txt b/tests/baselines/reference/importCallExpressionInAMD2.errors.txt
deleted file mode 100644
index ba22b5c026a43..0000000000000
--- a/tests/baselines/reference/importCallExpressionInAMD2.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-==== 2.ts (0 errors) ====
-    // We use Promise<any> for now as there is no way to specify shape of module object
-    function foo(x: Promise<any>) {
-        x.then(value => {
-            let b = new value.B();
-            b.print();
-        })
-    }
-    
-    foo(import("./0"));
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.js b/tests/baselines/reference/importCallExpressionInAMD2.js
index a5e74e06ac078..3bc577db20937 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.js
+++ b/tests/baselines/reference/importCallExpressionInAMD2.js
@@ -27,39 +27,6 @@ define(["require", "exports"], function (require, exports) {
     exports.B = B;
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     // We use Promise<any> for now as there is no way to specify shape of module object
@@ -69,5 +36,5 @@ define(["require", "exports"], function (require, exports) {
             b.print();
         });
     }
-    foo(new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar));
+    foo(new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }));
 });
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.types b/tests/baselines/reference/importCallExpressionInAMD2.types
index e3ce512be2beb..940c187c061dc 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.types
+++ b/tests/baselines/reference/importCallExpressionInAMD2.types
@@ -32,15 +32,11 @@ function foo(x: Promise<any>) {
 >value => {        let b = new value.B();        b.print();    } : (value: any) => void
 >                                                                : ^     ^^^^^^^^^^^^^^
 >value : any
->      : ^^^
 
         let b = new value.B();
 >b : any
->  : ^^^
 >new value.B() : any
->              : ^^^
 >value.B : any
->        : ^^^
 >value : any
 >      : ^^^
 >B : any
@@ -48,9 +44,7 @@ function foo(x: Promise<any>) {
 
         b.print();
 >b.print() : any
->          : ^^^
 >b.print : any
->        : ^^^
 >b : any
 >  : ^^^
 >print : any
diff --git a/tests/baselines/reference/importCallExpressionInAMD3.errors.txt b/tests/baselines/reference/importCallExpressionInAMD3.errors.txt
deleted file mode 100644
index a63ab9546cebf..0000000000000
--- a/tests/baselines/reference/importCallExpressionInAMD3.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-==== 2.ts (0 errors) ====
-    async function foo() {
-        class C extends (await import("./0")).B {}
-        var c = new C();
-        c.print();
-    }
-    foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInAMD3.js b/tests/baselines/reference/importCallExpressionInAMD3.js
index b258242c9796d..895f29ff2d712 100644
--- a/tests/baselines/reference/importCallExpressionInAMD3.js
+++ b/tests/baselines/reference/importCallExpressionInAMD3.js
@@ -24,43 +24,10 @@ define(["require", "exports"], function (require, exports) {
     exports.B = B;
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     async function foo() {
-        class C extends (await new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar)).B {
+        class C extends (await new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); })).B {
         }
         var c = new C();
         c.print();
diff --git a/tests/baselines/reference/importCallExpressionInAMD4.errors.txt b/tests/baselines/reference/importCallExpressionInAMD4.errors.txt
deleted file mode 100644
index ddcb02d3e13df..0000000000000
--- a/tests/baselines/reference/importCallExpressionInAMD4.errors.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-    export function foo() { return "foo" }
-    
-==== 1.ts (0 errors) ====
-    export function backup() { return "backup"; }
-    
-==== 2.ts (0 errors) ====
-    declare var console: any;
-    class C {
-        private myModule = import("./0");
-        method() {
-            const loadAsync = import("./0");
-            this.myModule.then(Zero => {
-                console.log(Zero.foo());
-            }, async err => {
-                console.log(err);
-                let one = await import("./1");
-                console.log(one.backup());
-            });
-        }
-    }
-    
-    export class D {
-        private myModule = import("./0");
-        method() {
-            const loadAsync = import("./0");
-            this.myModule.then(Zero => {
-                console.log(Zero.foo());
-            }, async err => {
-                console.log(err);
-                let one = await import("./1");
-                console.log(one.backup());
-            });
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInAMD4.js b/tests/baselines/reference/importCallExpressionInAMD4.js
index 9105f7ec074be..4811e6ef26f0b 100644
--- a/tests/baselines/reference/importCallExpressionInAMD4.js
+++ b/tests/baselines/reference/importCallExpressionInAMD4.js
@@ -60,69 +60,36 @@ define(["require", "exports"], function (require, exports) {
     function backup() { return "backup"; }
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.D = void 0;
     class C {
         constructor() {
-            this.myModule = new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
+            this.myModule = new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
         }
         method() {
-            const loadAsync = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+            const loadAsync = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
             this.myModule.then(Zero => {
                 console.log(Zero.foo());
             }, async (err) => {
                 console.log(err);
-                let one = await new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); }).then(__importStar);
+                let one = await new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); });
                 console.log(one.backup());
             });
         }
     }
     class D {
         constructor() {
-            this.myModule = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+            this.myModule = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
         }
         method() {
-            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
+            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
             this.myModule.then(Zero => {
                 console.log(Zero.foo());
             }, async (err) => {
                 console.log(err);
-                let one = await new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); }).then(__importStar);
+                let one = await new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); });
                 console.log(one.backup());
             });
         }
diff --git a/tests/baselines/reference/importCallExpressionInAMD4.types b/tests/baselines/reference/importCallExpressionInAMD4.types
index 2b2ca33e0e0da..1f5c390e64b71 100644
--- a/tests/baselines/reference/importCallExpressionInAMD4.types
+++ b/tests/baselines/reference/importCallExpressionInAMD4.types
@@ -28,7 +28,6 @@ export function backup() { return "backup"; }
 === 2.ts ===
 declare var console: any;
 >console : any
->        : ^^^
 
 class C {
 >C : C
@@ -74,9 +73,7 @@ class C {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
->                        : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -94,19 +91,15 @@ class C {
 >async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        } : (err: any) => Promise<void>
 >                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^
 >err : any
->    : ^^^
 
             console.log(err);
 >console.log(err) : any
->                 : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
 >    : ^^^
 >err : any
->    : ^^^
 
             let one = await import("./1");
 >one : typeof import("1")
@@ -120,9 +113,7 @@ class C {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
->                          : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -184,9 +175,7 @@ export class D {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
->                        : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -204,19 +193,15 @@ export class D {
 >async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        } : (err: any) => Promise<void>
 >                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^
 >err : any
->    : ^^^
 
             console.log(err);
 >console.log(err) : any
->                 : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
 >    : ^^^
 >err : any
->    : ^^^
 
             let one = await import("./1");
 >one : typeof import("1")
@@ -230,9 +215,7 @@ export class D {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
->                          : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
diff --git a/tests/baselines/reference/importCallExpressionInCJS1.js b/tests/baselines/reference/importCallExpressionInCJS1.js
index aa00938a45996..35be51f4c7d89 100644
--- a/tests/baselines/reference/importCallExpressionInCJS1.js
+++ b/tests/baselines/reference/importCallExpressionInCJS1.js
@@ -23,47 +23,14 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.p2 = void 0;
-Promise.resolve().then(() => __importStar(require("./0")));
-var p1 = Promise.resolve().then(() => __importStar(require("./0")));
+Promise.resolve().then(() => require("./0"));
+var p1 = Promise.resolve().then(() => require("./0"));
 p1.then(zero => {
     return zero.foo();
 });
-exports.p2 = Promise.resolve().then(() => __importStar(require("./0")));
+exports.p2 = Promise.resolve().then(() => require("./0"));
 function foo() {
-    const p2 = Promise.resolve().then(() => __importStar(require("./0")));
+    const p2 = Promise.resolve().then(() => require("./0"));
 }
diff --git a/tests/baselines/reference/importCallExpressionInCJS2.js b/tests/baselines/reference/importCallExpressionInCJS2.js
index 0c6ab6027f689..b0efcae6197e2 100644
--- a/tests/baselines/reference/importCallExpressionInCJS2.js
+++ b/tests/baselines/reference/importCallExpressionInCJS2.js
@@ -29,45 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.backup = backup;
 function backup() { return "backup"; }
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 async function compute(promise) {
     let j = await promise;
     if (!j) {
-        j = await Promise.resolve().then(() => __importStar(require("./1")));
+        j = await Promise.resolve().then(() => require("./1"));
         return j.backup();
     }
     return j.foo();
 }
-compute(Promise.resolve().then(() => __importStar(require("./0"))));
+compute(Promise.resolve().then(() => require("./0")));
diff --git a/tests/baselines/reference/importCallExpressionInCJS3.js b/tests/baselines/reference/importCallExpressionInCJS3.js
index ea5abc43eaad2..fde871e6e12c5 100644
--- a/tests/baselines/reference/importCallExpressionInCJS3.js
+++ b/tests/baselines/reference/importCallExpressionInCJS3.js
@@ -25,39 +25,6 @@ class B {
 }
 exports.B = B;
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 // We use Promise<any> for now as there is no way to specify shape of module object
 function foo(x) {
     x.then(value => {
@@ -65,4 +32,4 @@ function foo(x) {
         b.print();
     });
 }
-foo(Promise.resolve().then(() => __importStar(require("./0"))));
+foo(Promise.resolve().then(() => require("./0")));
diff --git a/tests/baselines/reference/importCallExpressionInCJS4.js b/tests/baselines/reference/importCallExpressionInCJS4.js
index f5c1f01cf053a..823fd6b4b95f6 100644
--- a/tests/baselines/reference/importCallExpressionInCJS4.js
+++ b/tests/baselines/reference/importCallExpressionInCJS4.js
@@ -22,41 +22,8 @@ class B {
 }
 exports.B = B;
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 async function foo() {
-    class C extends (await Promise.resolve().then(() => __importStar(require("./0")))).B {
+    class C extends (await Promise.resolve().then(() => require("./0"))).B {
     }
     var c = new C();
     c.print();
diff --git a/tests/baselines/reference/importCallExpressionInCJS5.js b/tests/baselines/reference/importCallExpressionInCJS5.js
index 6810bc810d08f..35ba9fe9a8dd8 100644
--- a/tests/baselines/reference/importCallExpressionInCJS5.js
+++ b/tests/baselines/reference/importCallExpressionInCJS5.js
@@ -57,67 +57,34 @@ exports.backup = backup;
 function backup() { return "backup"; }
 //// [2.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.D = void 0;
 class C {
     constructor() {
-        this.myModule = Promise.resolve().then(() => __importStar(require("./0")));
+        this.myModule = Promise.resolve().then(() => require("./0"));
     }
     method() {
-        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
+        const loadAsync = Promise.resolve().then(() => require("./0"));
         this.myModule.then(Zero => {
             console.log(Zero.foo());
         }, async (err) => {
             console.log(err);
-            let one = await Promise.resolve().then(() => __importStar(require("./1")));
+            let one = await Promise.resolve().then(() => require("./1"));
             console.log(one.backup());
         });
     }
 }
 class D {
     constructor() {
-        this.myModule = Promise.resolve().then(() => __importStar(require("./0")));
+        this.myModule = Promise.resolve().then(() => require("./0"));
     }
     method() {
-        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
+        const loadAsync = Promise.resolve().then(() => require("./0"));
         this.myModule.then(Zero => {
             console.log(Zero.foo());
         }, async (err) => {
             console.log(err);
-            let one = await Promise.resolve().then(() => __importStar(require("./1")));
+            let one = await Promise.resolve().then(() => require("./1"));
             console.log(one.backup());
         });
     }
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt
deleted file mode 100644
index 02fb46d036916..0000000000000
--- a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== something.ts (0 errors) ====
-    export = 42;
-    
-==== index.ts (0 errors) ====
-    export = async function() {
-        const something = await import("./something");
-    };
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js
index b1e28d0ad9a86..1fcef2bde3941 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js
@@ -14,42 +14,9 @@ define(["require", "exports"], function (require, exports) {
     return 42;
 });
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     return async function () {
-        const something = await new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); }).then(__importStar);
+        const something = await new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); });
     };
 });
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
index 08fddebb2b401..fdeaef81b76d4 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
@@ -10,12 +10,12 @@ export = async function() {
 >                                                                      : ^^^^^^^^^^^^^^^^^^^
 
     const something = await import("./something");
->something : { default: 42; }
->          : ^^^^^^^^^^^^^^^^
->await import("./something") : { default: 42; }
->                            : ^^^^^^^^^^^^^^^^
->import("./something") : Promise<{ default: 42; }>
->                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>something : 42
+>          : ^^
+>await import("./something") : 42
+>                            : ^^
+>import("./something") : Promise<42>
+>                      : ^^^^^^^^^^^
 >"./something" : "./something"
 >              : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js b/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js
index 7670be1a3603c..72e3a0ec0af9b 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js
@@ -13,39 +13,6 @@ export = async function() {
 module.exports = 42;
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 module.exports = async function () {
-    const something = await Promise.resolve().then(() => __importStar(require("./something")));
+    const something = await Promise.resolve().then(() => require("./something"));
 };
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt
deleted file mode 100644
index 2da8a6aaacf89..0000000000000
--- a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== something.ts (0 errors) ====
-    export = 42;
-    
-==== index.ts (0 errors) ====
-    export = async function() {
-        const something = await import("./something");
-    };
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js
index 54290d151c279..5f70891b09e8e 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js
@@ -22,39 +22,6 @@ export = async function() {
     return 42;
 });
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -67,6 +34,6 @@ var __importStar = (this && this.__importStar) || (function () {
     "use strict";
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     return async function () {
-        const something = await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./something"))) : new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); }).then(__importStar));
+        const something = await (__syncRequire ? Promise.resolve().then(() => require("./something")) : new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); }));
     };
 });
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
index e08523c30a49b..ef1c8337be00d 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
@@ -10,12 +10,12 @@ export = async function() {
 >                                                                      : ^^^^^^^^^^^^^^^^^^^
 
     const something = await import("./something");
->something : { default: 42; }
->          : ^^^^^^^^^^^^^^^^
->await import("./something") : { default: 42; }
->                            : ^^^^^^^^^^^^^^^^
->import("./something") : Promise<{ default: 42; }>
->                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>something : 42
+>          : ^^
+>await import("./something") : 42
+>                            : ^^
+>import("./something") : Promise<42>
+>                      : ^^^^^^^^^^^
 >"./something" : "./something"
 >              : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.js b/tests/baselines/reference/importCallExpressionInScriptContext1.js
index 4387900106dcd..170dbf5cfcfc2 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext1.js
+++ b/tests/baselines/reference/importCallExpressionInScriptContext1.js
@@ -13,38 +13,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var p1 = Promise.resolve().then(() => __importStar(require("./0")));
+var p1 = Promise.resolve().then(() => require("./0"));
 function arguments() { } // this is allow as the file doesn't have implicit "use strict"
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext2.js b/tests/baselines/reference/importCallExpressionInScriptContext2.js
index 1bf061c07262a..67b309ca0d96d 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext2.js
+++ b/tests/baselines/reference/importCallExpressionInScriptContext2.js
@@ -15,38 +15,5 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var p1 = Promise.resolve().then(() => __importStar(require("./0")));
+var p1 = Promise.resolve().then(() => require("./0"));
 function arguments() { }
diff --git a/tests/baselines/reference/importCallExpressionInSystem1.errors.txt b/tests/baselines/reference/importCallExpressionInSystem1.errors.txt
deleted file mode 100644
index 9d27f4d7981f3..0000000000000
--- a/tests/baselines/reference/importCallExpressionInSystem1.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInSystem2.errors.txt b/tests/baselines/reference/importCallExpressionInSystem2.errors.txt
deleted file mode 100644
index 8be7f76ab8ad7..0000000000000
--- a/tests/baselines/reference/importCallExpressionInSystem2.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-==== 2.ts (0 errors) ====
-    // We use Promise<any> for now as there is no way to specify shape of module object
-    function foo(x: Promise<any>) {
-        x.then(value => {
-            let b = new value.B();
-            b.print();
-        })
-    }
-    
-    foo(import("./0"));
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInSystem2.types b/tests/baselines/reference/importCallExpressionInSystem2.types
index 9cb7891c26e74..2ffd403bec514 100644
--- a/tests/baselines/reference/importCallExpressionInSystem2.types
+++ b/tests/baselines/reference/importCallExpressionInSystem2.types
@@ -32,15 +32,11 @@ function foo(x: Promise<any>) {
 >value => {        let b = new value.B();        b.print();    } : (value: any) => void
 >                                                                : ^     ^^^^^^^^^^^^^^
 >value : any
->      : ^^^
 
         let b = new value.B();
 >b : any
->  : ^^^
 >new value.B() : any
->              : ^^^
 >value.B : any
->        : ^^^
 >value : any
 >      : ^^^
 >B : any
@@ -48,9 +44,7 @@ function foo(x: Promise<any>) {
 
         b.print();
 >b.print() : any
->          : ^^^
 >b.print : any
->        : ^^^
 >b : any
 >  : ^^^
 >print : any
diff --git a/tests/baselines/reference/importCallExpressionInSystem3.errors.txt b/tests/baselines/reference/importCallExpressionInSystem3.errors.txt
deleted file mode 100644
index 32beb24605369..0000000000000
--- a/tests/baselines/reference/importCallExpressionInSystem3.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-==== 2.ts (0 errors) ====
-    async function foo() {
-        class C extends (await import("./0")).B {}
-        var c = new C();
-        c.print();
-    }
-    foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInSystem4.errors.txt b/tests/baselines/reference/importCallExpressionInSystem4.errors.txt
deleted file mode 100644
index 2551f3a90f1b7..0000000000000
--- a/tests/baselines/reference/importCallExpressionInSystem4.errors.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-    export function foo() { return "foo" }
-    
-==== 1.ts (0 errors) ====
-    export function backup() { return "backup"; }
-    
-==== 2.ts (0 errors) ====
-    declare var console: any;
-    class C {
-        private myModule = import("./0");
-        method() {
-            const loadAsync = import("./0");
-            this.myModule.then(Zero => {
-                console.log(Zero.foo());
-            }, async err => {
-                console.log(err);
-                let one = await import("./1");
-                console.log(one.backup());
-            });
-        }
-    }
-    
-    export class D {
-        private myModule = import("./0");
-        method() {
-            const loadAsync = import("./0");
-            this.myModule.then(Zero => {
-                console.log(Zero.foo());
-            }, async err => {
-                console.log(err);
-                let one = await import("./1");
-                console.log(one.backup());
-            });
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInSystem4.types b/tests/baselines/reference/importCallExpressionInSystem4.types
index 5392040581edf..cef7710895ee0 100644
--- a/tests/baselines/reference/importCallExpressionInSystem4.types
+++ b/tests/baselines/reference/importCallExpressionInSystem4.types
@@ -28,7 +28,6 @@ export function backup() { return "backup"; }
 === 2.ts ===
 declare var console: any;
 >console : any
->        : ^^^
 
 class C {
 >C : C
@@ -74,9 +73,7 @@ class C {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
->                        : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -94,19 +91,15 @@ class C {
 >async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        } : (err: any) => Promise<void>
 >                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^
 >err : any
->    : ^^^
 
             console.log(err);
 >console.log(err) : any
->                 : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
 >    : ^^^
 >err : any
->    : ^^^
 
             let one = await import("./1");
 >one : typeof import("1")
@@ -120,9 +113,7 @@ class C {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
->                          : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -184,9 +175,7 @@ export class D {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
->                        : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -204,19 +193,15 @@ export class D {
 >async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        } : (err: any) => Promise<void>
 >                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^
 >err : any
->    : ^^^
 
             console.log(err);
 >console.log(err) : any
->                 : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
 >    : ^^^
 >err : any
->    : ^^^
 
             let one = await import("./1");
 >one : typeof import("1")
@@ -230,9 +215,7 @@ export class D {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
->                          : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
diff --git a/tests/baselines/reference/importCallExpressionInUMD1.errors.txt b/tests/baselines/reference/importCallExpressionInUMD1.errors.txt
deleted file mode 100644
index bf7033337d29f..0000000000000
--- a/tests/baselines/reference/importCallExpressionInUMD1.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    import("./0");
-    var p1 = import("./0");
-    p1.then(zero => {
-        return zero.foo();
-    });
-    
-    export var p2 = import("./0");
-    
-    function foo() {
-        const p2 = import("./0");
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInUMD1.js b/tests/baselines/reference/importCallExpressionInUMD1.js
index 283861ebac3ed..569b7764c70ea 100644
--- a/tests/baselines/reference/importCallExpressionInUMD1.js
+++ b/tests/baselines/reference/importCallExpressionInUMD1.js
@@ -32,39 +32,6 @@ function foo() {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -78,13 +45,13 @@ var __importStar = (this && this.__importStar) || (function () {
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.p2 = void 0;
-    __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
-    var p1 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+    __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
+    var p1 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
+    exports.p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
     function foo() {
-        const p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+        const p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.errors.txt b/tests/baselines/reference/importCallExpressionInUMD2.errors.txt
deleted file mode 100644
index 1cf69496ef60f..0000000000000
--- a/tests/baselines/reference/importCallExpressionInUMD2.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-==== 2.ts (0 errors) ====
-    // We use Promise<any> for now as there is no way to specify shape of module object
-    function foo(x: Promise<any>) {
-        x.then(value => {
-            let b = new value.B();
-            b.print();
-        })
-    }
-    
-    foo(import("./0"));
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.js b/tests/baselines/reference/importCallExpressionInUMD2.js
index d3d466fd54354..e804925921c84 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.js
+++ b/tests/baselines/reference/importCallExpressionInUMD2.js
@@ -35,39 +35,6 @@ foo(import("./0"));
     exports.B = B;
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -86,5 +53,5 @@ var __importStar = (this && this.__importStar) || (function () {
             b.print();
         });
     }
-    foo(__syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar));
+    foo(__syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }));
 });
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.types b/tests/baselines/reference/importCallExpressionInUMD2.types
index aa3ac180655b9..55a9c46617fe4 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.types
+++ b/tests/baselines/reference/importCallExpressionInUMD2.types
@@ -32,15 +32,11 @@ function foo(x: Promise<any>) {
 >value => {        let b = new value.B();        b.print();    } : (value: any) => void
 >                                                                : ^     ^^^^^^^^^^^^^^
 >value : any
->      : ^^^
 
         let b = new value.B();
 >b : any
->  : ^^^
 >new value.B() : any
->              : ^^^
 >value.B : any
->        : ^^^
 >value : any
 >      : ^^^
 >B : any
@@ -48,9 +44,7 @@ function foo(x: Promise<any>) {
 
         b.print();
 >b.print() : any
->          : ^^^
 >b.print : any
->        : ^^^
 >b : any
 >  : ^^^
 >print : any
diff --git a/tests/baselines/reference/importCallExpressionInUMD3.errors.txt b/tests/baselines/reference/importCallExpressionInUMD3.errors.txt
deleted file mode 100644
index 0bcdd58f718b6..0000000000000
--- a/tests/baselines/reference/importCallExpressionInUMD3.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-==== 2.ts (0 errors) ====
-    async function foo() {
-        class C extends (await import("./0")).B {}
-        var c = new C();
-        c.print();
-    }
-    foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInUMD3.js b/tests/baselines/reference/importCallExpressionInUMD3.js
index 211bdd61fa1c5..eb34e6ca320a2 100644
--- a/tests/baselines/reference/importCallExpressionInUMD3.js
+++ b/tests/baselines/reference/importCallExpressionInUMD3.js
@@ -32,39 +32,6 @@ foo();
     exports.B = B;
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -77,7 +44,7 @@ var __importStar = (this && this.__importStar) || (function () {
     "use strict";
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     async function foo() {
-        class C extends (await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar))).B {
+        class C extends (await (__syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }))).B {
         }
         var c = new C();
         c.print();
diff --git a/tests/baselines/reference/importCallExpressionInUMD4.errors.txt b/tests/baselines/reference/importCallExpressionInUMD4.errors.txt
deleted file mode 100644
index f3dfe5f8d8181..0000000000000
--- a/tests/baselines/reference/importCallExpressionInUMD4.errors.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export class B {
-        print() { return "I am B"}
-    }
-    
-    export function foo() { return "foo" }
-    
-==== 1.ts (0 errors) ====
-    export function backup() { return "backup"; }
-    
-==== 2.ts (0 errors) ====
-    declare var console: any;
-    class C {
-        private myModule = import("./0");
-        method() {
-            const loadAsync = import("./0");
-            this.myModule.then(Zero => {
-                console.log(Zero.foo());
-            }, async err => {
-                console.log(err);
-                let one = await import("./1");
-                console.log(one.backup());
-            });
-        }
-    }
-    
-    export class D {
-        private myModule = import("./0");
-        method() {
-            const loadAsync = import("./0");
-            this.myModule.then(Zero => {
-                console.log(Zero.foo());
-            }, async err => {
-                console.log(err);
-                let one = await import("./1");
-                console.log(one.backup());
-            });
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInUMD4.js b/tests/baselines/reference/importCallExpressionInUMD4.js
index 7c019ff67e421..c166af4acc77d 100644
--- a/tests/baselines/reference/importCallExpressionInUMD4.js
+++ b/tests/baselines/reference/importCallExpressionInUMD4.js
@@ -76,39 +76,6 @@ export class D {
     function backup() { return "backup"; }
 });
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -124,30 +91,30 @@ var __importStar = (this && this.__importStar) || (function () {
     exports.D = void 0;
     class C {
         constructor() {
-            this.myModule = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
+            this.myModule = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
         }
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
             this.myModule.then(Zero => {
                 console.log(Zero.foo());
             }, async (err) => {
                 console.log(err);
-                let one = await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./1"))) : new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); }).then(__importStar));
+                let one = await (__syncRequire ? Promise.resolve().then(() => require("./1")) : new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); }));
                 console.log(one.backup());
             });
         }
     }
     class D {
         constructor() {
-            this.myModule = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
+            this.myModule = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
         }
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
             this.myModule.then(Zero => {
                 console.log(Zero.foo());
             }, async (err) => {
                 console.log(err);
-                let one = await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./1"))) : new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); }).then(__importStar));
+                let one = await (__syncRequire ? Promise.resolve().then(() => require("./1")) : new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); }));
                 console.log(one.backup());
             });
         }
diff --git a/tests/baselines/reference/importCallExpressionInUMD4.types b/tests/baselines/reference/importCallExpressionInUMD4.types
index e5f99a161eab3..4cb77bf0414a0 100644
--- a/tests/baselines/reference/importCallExpressionInUMD4.types
+++ b/tests/baselines/reference/importCallExpressionInUMD4.types
@@ -28,7 +28,6 @@ export function backup() { return "backup"; }
 === 2.ts ===
 declare var console: any;
 >console : any
->        : ^^^
 
 class C {
 >C : C
@@ -74,9 +73,7 @@ class C {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
->                        : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -94,19 +91,15 @@ class C {
 >async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        } : (err: any) => Promise<void>
 >                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^
 >err : any
->    : ^^^
 
             console.log(err);
 >console.log(err) : any
->                 : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
 >    : ^^^
 >err : any
->    : ^^^
 
             let one = await import("./1");
 >one : typeof import("1")
@@ -120,9 +113,7 @@ class C {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
->                          : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -184,9 +175,7 @@ export class D {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
->                        : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -204,19 +193,15 @@ export class D {
 >async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        } : (err: any) => Promise<void>
 >                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^
 >err : any
->    : ^^^
 
             console.log(err);
 >console.log(err) : any
->                 : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
 >    : ^^^
 >err : any
->    : ^^^
 
             let one = await import("./1");
 >one : typeof import("1")
@@ -230,9 +215,7 @@ export class D {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
->                          : ^^^
 >console.log : any
->            : ^^^
 >console : any
 >        : ^^^
 >log : any
diff --git a/tests/baselines/reference/importCallExpressionInUMD5.errors.txt b/tests/baselines/reference/importCallExpressionInUMD5.errors.txt
deleted file mode 100644
index 3c63be1145fa7..0000000000000
--- a/tests/baselines/reference/importCallExpressionInUMD5.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.ts (0 errors) ====
-    export function foo() { return "foo"; }
-    
-==== 1.ts (0 errors) ====
-    // https://github.com/microsoft/TypeScript/issues/36780
-    async function func() {
-        const packageName = '.';
-        const packageJson = await import(packageName + '/package.json');
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionInUMD5.js b/tests/baselines/reference/importCallExpressionInUMD5.js
index 0e7c4cb93f497..e070878f1f32f 100644
--- a/tests/baselines/reference/importCallExpressionInUMD5.js
+++ b/tests/baselines/reference/importCallExpressionInUMD5.js
@@ -27,39 +27,6 @@ async function func() {
     function foo() { return "foo"; }
 });
 //// [1.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -85,7 +52,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const packageName = '.';
-            const packageJson = yield (_a = packageName + '/package.json', __syncRequire ? Promise.resolve().then(() => __importStar(require(_a))) : new Promise((resolve_1, reject_1) => { require([_a], resolve_1, reject_1); }).then(__importStar));
+            const packageJson = yield (_a = packageName + '/package.json', __syncRequire ? Promise.resolve().then(() => require(_a)) : new Promise((resolve_1, reject_1) => { require([_a], resolve_1, reject_1); }));
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionInUMD5.types b/tests/baselines/reference/importCallExpressionInUMD5.types
index 4de7478aab0df..a597d0eff5a03 100644
--- a/tests/baselines/reference/importCallExpressionInUMD5.types
+++ b/tests/baselines/reference/importCallExpressionInUMD5.types
@@ -21,9 +21,7 @@ async function func() {
 
     const packageJson = await import(packageName + '/package.json');
 >packageJson : any
->            : ^^^
 >await import(packageName + '/package.json') : any
->                                            : ^^^
 >import(packageName + '/package.json') : Promise<any>
 >                                      : ^^^^^^^^^^^^
 >packageName + '/package.json' : string
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.errors.txt b/tests/baselines/reference/importCallExpressionNestedAMD.errors.txt
deleted file mode 100644
index 076931f140681..0000000000000
--- a/tests/baselines/reference/importCallExpressionNestedAMD.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export default "./foo";
-    
-==== index.ts (0 errors) ====
-    async function foo() {
-        return await import((await import("./foo")).default);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.js b/tests/baselines/reference/importCallExpressionNestedAMD.js
index 20dc7486a35db..678c02a8e73c2 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.js
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.js
@@ -15,39 +15,6 @@ define(["require", "exports"], function (require, exports) {
     exports.default = "./foo";
 });
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -61,7 +28,7 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function foo() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield new Promise((resolve_1, reject_1) => { require([(yield new Promise((resolve_2, reject_2) => { require(["./foo"], resolve_2, reject_2); }).then(__importStar)).default], resolve_1, reject_1); }).then(__importStar);
+            return yield new Promise((resolve_1, reject_1) => { require([(yield new Promise((resolve_2, reject_2) => { require(["./foo"], resolve_2, reject_2); })).default], resolve_1, reject_1); });
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.types b/tests/baselines/reference/importCallExpressionNestedAMD.types
index 11c285a30fdde..b6d446cf46507 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.types
@@ -11,7 +11,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >await import((await import("./foo")).default) : any
->                                              : ^^^
 >import((await import("./foo")).default) : Promise<any>
 >                                        : ^^^^^^^^^^^^
 >(await import("./foo")).default : "./foo"
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.errors.txt b/tests/baselines/reference/importCallExpressionNestedAMD2.errors.txt
deleted file mode 100644
index 076931f140681..0000000000000
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export default "./foo";
-    
-==== index.ts (0 errors) ====
-    async function foo() {
-        return await import((await import("./foo")).default);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.js b/tests/baselines/reference/importCallExpressionNestedAMD2.js
index 4233883352412..4f90f4e7732a2 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.js
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.js
@@ -15,39 +15,6 @@ define(["require", "exports"], function (require, exports) {
     exports.default = "./foo";
 });
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -90,8 +57,8 @@ define(["require", "exports"], function (require, exports) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, new Promise(function (resolve_1, reject_1) { require(["./foo"], resolve_1, reject_1); }).then(__importStar)];
-                    case 1: return [4 /*yield*/, new Promise(function (resolve_2, reject_2) { require([(_a.sent()).default], resolve_2, reject_2); }).then(__importStar)];
+                    case 0: return [4 /*yield*/, new Promise(function (resolve_1, reject_1) { require(["./foo"], resolve_1, reject_1); })];
+                    case 1: return [4 /*yield*/, new Promise(function (resolve_2, reject_2) { require([(_a.sent()).default], resolve_2, reject_2); })];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.types b/tests/baselines/reference/importCallExpressionNestedAMD2.types
index f8d6a4bf19c03..7d66061c112fd 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.types
@@ -11,7 +11,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >await import((await import("./foo")).default) : any
->                                              : ^^^
 >import((await import("./foo")).default) : Promise<any>
 >                                        : ^^^^^^^^^^^^
 >(await import("./foo")).default : "./foo"
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS.js b/tests/baselines/reference/importCallExpressionNestedCJS.js
index 39a60f3efe1c5..3101057a49788 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS.js
+++ b/tests/baselines/reference/importCallExpressionNestedCJS.js
@@ -13,39 +13,6 @@ async function foo() {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "./foo";
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -57,6 +24,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 function foo() {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield Promise.resolve(`${(yield Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s)));
+        return yield Promise.resolve(`${(yield Promise.resolve().then(() => require("./foo"))).default}`).then(s => require(s));
     });
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS2.js b/tests/baselines/reference/importCallExpressionNestedCJS2.js
index 929d0ff086209..5d2371ea723d5 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS2.js
+++ b/tests/baselines/reference/importCallExpressionNestedCJS2.js
@@ -13,39 +13,6 @@ async function foo() {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "./foo";
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -86,8 +53,8 @@ function foo() {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("./foo")); })];
-                case 1: return [4 /*yield*/, Promise.resolve("".concat((_a.sent()).default)).then(function (s) { return __importStar(require(s)); })];
+                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require("./foo"); })];
+                case 1: return [4 /*yield*/, Promise.resolve("".concat((_a.sent()).default)).then(function (s) { return require(s); })];
                 case 2: return [2 /*return*/, _a.sent()];
             }
         });
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem.errors.txt b/tests/baselines/reference/importCallExpressionNestedSystem.errors.txt
deleted file mode 100644
index df96a9b44fa78..0000000000000
--- a/tests/baselines/reference/importCallExpressionNestedSystem.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export default "./foo";
-    
-==== index.ts (0 errors) ====
-    async function foo() {
-        return await import((await import("./foo")).default);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem.types b/tests/baselines/reference/importCallExpressionNestedSystem.types
index 3d320c72d33b6..016d56fbe7dd7 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem.types
@@ -11,7 +11,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >await import((await import("./foo")).default) : any
->                                              : ^^^
 >import((await import("./foo")).default) : Promise<any>
 >                                        : ^^^^^^^^^^^^
 >(await import("./foo")).default : "./foo"
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem2.errors.txt b/tests/baselines/reference/importCallExpressionNestedSystem2.errors.txt
deleted file mode 100644
index df96a9b44fa78..0000000000000
--- a/tests/baselines/reference/importCallExpressionNestedSystem2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export default "./foo";
-    
-==== index.ts (0 errors) ====
-    async function foo() {
-        return await import((await import("./foo")).default);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem2.types b/tests/baselines/reference/importCallExpressionNestedSystem2.types
index 2704d3a6d0986..b6112d640a3ed 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem2.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem2.types
@@ -11,7 +11,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >await import((await import("./foo")).default) : any
->                                              : ^^^
 >import((await import("./foo")).default) : Promise<any>
 >                                        : ^^^^^^^^^^^^
 >(await import("./foo")).default : "./foo"
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.errors.txt b/tests/baselines/reference/importCallExpressionNestedUMD.errors.txt
deleted file mode 100644
index 44fd274c9d149..0000000000000
--- a/tests/baselines/reference/importCallExpressionNestedUMD.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export default "./foo";
-    
-==== index.ts (0 errors) ====
-    async function foo() {
-        return await import((await import("./foo")).default);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.js b/tests/baselines/reference/importCallExpressionNestedUMD.js
index 06ce3a055c1f4..6d6c1b9b3e5cf 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.js
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.js
@@ -23,39 +23,6 @@ async function foo() {
     exports.default = "./foo";
 });
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -79,7 +46,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     function foo() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return yield (_a = (yield __syncRequire ? Promise.resolve().then(() => __importStar(require("./foo"))) : new Promise((resolve_1, reject_1) => { require(["./foo"], resolve_1, reject_1); }).then(__importStar)).default, __syncRequire ? Promise.resolve().then(() => __importStar(require(_a))) : new Promise((resolve_2, reject_2) => { require([_a], resolve_2, reject_2); }).then(__importStar));
+            return yield (_a = (yield __syncRequire ? Promise.resolve().then(() => require("./foo")) : new Promise((resolve_1, reject_1) => { require(["./foo"], resolve_1, reject_1); })).default, __syncRequire ? Promise.resolve().then(() => require(_a)) : new Promise((resolve_2, reject_2) => { require([_a], resolve_2, reject_2); }));
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.types b/tests/baselines/reference/importCallExpressionNestedUMD.types
index 0987715c279a7..a4bcb595521bb 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.types
@@ -11,7 +11,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >await import((await import("./foo")).default) : any
->                                              : ^^^
 >import((await import("./foo")).default) : Promise<any>
 >                                        : ^^^^^^^^^^^^
 >(await import("./foo")).default : "./foo"
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.errors.txt b/tests/baselines/reference/importCallExpressionNestedUMD2.errors.txt
deleted file mode 100644
index 44fd274c9d149..0000000000000
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export default "./foo";
-    
-==== index.ts (0 errors) ====
-    async function foo() {
-        return await import((await import("./foo")).default);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.js b/tests/baselines/reference/importCallExpressionNestedUMD2.js
index 38d7d108c974e..c74e8d9eda23e 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.js
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.js
@@ -23,39 +23,6 @@ async function foo() {
     exports.default = "./foo";
 });
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -108,8 +75,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             return __generator(this, function (_a) {
                 var _b;
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return __importStar(require("./foo")); }) : new Promise(function (resolve_1, reject_1) { require(["./foo"], resolve_1, reject_1); }).then(__importStar)];
-                    case 1: return [4 /*yield*/, (_b = (_a.sent()).default, __syncRequire ? Promise.resolve().then(function () { return __importStar(require(_b)); }) : new Promise(function (resolve_2, reject_2) { require([_b], resolve_2, reject_2); }).then(__importStar))];
+                    case 0: return [4 /*yield*/, __syncRequire ? Promise.resolve().then(function () { return require("./foo"); }) : new Promise(function (resolve_1, reject_1) { require(["./foo"], resolve_1, reject_1); })];
+                    case 1: return [4 /*yield*/, (_b = (_a.sent()).default, __syncRequire ? Promise.resolve().then(function () { return require(_b); }) : new Promise(function (resolve_2, reject_2) { require([_b], resolve_2, reject_2); }))];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.types b/tests/baselines/reference/importCallExpressionNestedUMD2.types
index e0a8d1db3e130..c4cbc3ebb08a0 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.types
@@ -11,7 +11,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >await import((await import("./foo")).default) : any
->                                              : ^^^
 >import((await import("./foo")).default) : Promise<any>
 >                                        : ^^^^^^^^^^^^
 >(await import("./foo")).default : "./foo"
diff --git a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
index 4252b45fe218d..e7bf6909ce642 100644
--- a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
+++ b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
@@ -45,39 +45,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.backup = backup;
 function backup() { return "backup"; }
 //// [2.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -116,11 +83,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var C = /** @class */ (function () {
     function C() {
-        this.myModule = Promise.resolve().then(function () { return __importStar(require("./0")); });
+        this.myModule = Promise.resolve().then(function () { return require("./0"); });
     }
     C.prototype.method = function () {
         var _this = this;
-        var loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); });
+        var loadAsync = Promise.resolve().then(function () { return require("./0"); });
         this.myModule.then(function (Zero) {
             console.log(Zero.foo());
         }, function (err) { return __awaiter(_this, void 0, void 0, function () {
@@ -129,7 +96,7 @@ var C = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         console.log(err);
-                        return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("./1")); })];
+                        return [4 /*yield*/, Promise.resolve().then(function () { return require("./1"); })];
                     case 1:
                         one = _a.sent();
                         console.log(one.backup());
diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js
index 51bcdfc378162..0bda2486b75cc 100644
--- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js
+++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js
@@ -42,54 +42,21 @@ class C {
 exports.C = C;
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => __importStar(require(s)));
-Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-var p1 = Promise.resolve(`${ValidSomeCondition() ? "./0" : "externalModule"}`).then(s => __importStar(require(s)));
-var p1 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-var p11 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => __importStar(require(s)));
+Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => require(s));
+Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+var p1 = Promise.resolve(`${ValidSomeCondition() ? "./0" : "externalModule"}`).then(s => require(s));
+var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+var p11 = Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s));
 p1.then(zero => {
     return zero.foo(); // ok, zero is any
 });
 let j;
-var p3 = Promise.resolve(`${j = getSpecifier()}`).then(s => __importStar(require(s)));
+var p3 = Promise.resolve(`${j = getSpecifier()}`).then(s => require(s));
 function* loadModule(directories) {
     for (const directory of directories) {
         const path = `${directory}\\moduleFile`;
-        Promise.resolve(`${yield path}`).then(s => __importStar(require(s)));
+        Promise.resolve(`${yield path}`).then(s => require(s));
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js
index bbf0929466469..45c94899231a1 100644
--- a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js
+++ b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js
@@ -16,45 +16,12 @@ var p3 = import(["path1", "path2"]);
 var p4 = import(()=>"PathToModule");
 
 //// [importCallExpressionSpecifierNotStringTypeError.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 // Error specifier is not assignable to string
-Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-var p1 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s)));
-const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => __importStar(require(s)));
+Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s));
+const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s));
 p1.then(zero => {
     return zero.foo(); // ok, zero is any
 });
-var p3 = Promise.resolve(`${["path1", "path2"]}`).then(s => __importStar(require(s)));
-var p4 = Promise.resolve(`${() => "PathToModule"}`).then(s => __importStar(require(s)));
+var p3 = Promise.resolve(`${["path1", "path2"]}`).then(s => require(s));
+var p4 = Promise.resolve(`${() => "PathToModule"}`).then(s => require(s));
diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.js b/tests/baselines/reference/importCallExpressionWithTypeArgument.js
index fe70a0b01f4e9..a2804c582521a 100644
--- a/tests/baselines/reference/importCallExpressionWithTypeArgument.js
+++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.js
@@ -15,38 +15,5 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var p1 = Promise.resolve().then(() => __importStar(require("./0"))); // error
-var p2 = Promise.resolve().then(() => __importStar(require("./0"))); // error
+var p1 = Promise.resolve().then(() => require("./0")); // error
+var p2 = Promise.resolve().then(() => require("./0")); // error
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 8225d825e9fcb..d4c7e390ee746 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -12,10 +12,12 @@ var b: a;
 
 
 //// [importDeclWithClassModifiers.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.c = exports.b = exports.a = void 0;
-exports.a = x.c;
-exports.b = x.c;
-exports.c = x.c;
-var b;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.c = exports.b = exports.a = void 0;
+    exports.a = x.c;
+    exports.b = x.c;
+    exports.c = x.c;
+    var b;
+});
diff --git a/tests/baselines/reference/importDeclWithExportModifier.errors.txt b/tests/baselines/reference/importDeclWithExportModifier.errors.txt
index e314c53f07ee8..8da059494431f 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.errors.txt
+++ b/tests/baselines/reference/importDeclWithExportModifier.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 importDeclWithExportModifier.ts(5,19): error TS2708: Cannot use namespace 'x' as a value.
 importDeclWithExportModifier.ts(5,21): error TS2694: Namespace 'x' has no exported member 'c'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== importDeclWithExportModifier.ts (2 errors) ====
     namespace x {
         interface c {
diff --git a/tests/baselines/reference/importDefaultBindingDefer.errors.txt b/tests/baselines/reference/importDefaultBindingDefer.errors.txt
deleted file mode 100644
index d489281ef85f3..0000000000000
--- a/tests/baselines/reference/importDefaultBindingDefer.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-b.ts(1,19): error TS2307: Cannot find module 'a' or its corresponding type declarations.
-
-
-==== a.ts (0 errors) ====
-    export default function defer() {
-        console.log("defer from a");
-    }
-    
-==== b.ts (1 errors) ====
-    import defer from "a";
-                      ~~~
-!!! error TS2307: Cannot find module 'a' or its corresponding type declarations.
-    
-    defer();
\ No newline at end of file
diff --git a/tests/baselines/reference/importDefaultBindingDefer.types b/tests/baselines/reference/importDefaultBindingDefer.types
index f160cc1414c6b..f647f0914868d 100644
--- a/tests/baselines/reference/importDefaultBindingDefer.types
+++ b/tests/baselines/reference/importDefaultBindingDefer.types
@@ -20,12 +20,12 @@ export default function defer() {
 
 === b.ts ===
 import defer from "a";
->defer : any
->      : ^^^
+>defer : () => void
+>      : ^^^^^^^^^^
 
 defer();
->defer() : any
->        : ^^^
->defer : any
->      : ^^^
+>defer() : void
+>        : ^^^^
+>defer : () => void
+>      : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importDeferComments.errors.txt b/tests/baselines/reference/importDeferComments.errors.txt
deleted file mode 100644
index 56b486f8344d7..0000000000000
--- a/tests/baselines/reference/importDeferComments.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-b.ts(1,70): error TS2307: Cannot find module 'a' or its corresponding type declarations.
-
-
-==== a.ts (0 errors) ====
-    export {};
-    
-==== b.ts (1 errors) ====
-    /*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/;
-                                                                         ~~~
-!!! error TS2307: Cannot find module 'a' or its corresponding type declarations.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importDeferComments.types b/tests/baselines/reference/importDeferComments.types
index 36fb5b224a91a..6f06fb95216ac 100644
--- a/tests/baselines/reference/importDeferComments.types
+++ b/tests/baselines/reference/importDeferComments.types
@@ -6,6 +6,6 @@ export {};
 
 === b.ts ===
 /*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/;
->aNs : any
->    : ^^^
+>aNs : typeof aNs
+>    : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importDeferInvalidDefault.errors.txt b/tests/baselines/reference/importDeferInvalidDefault.errors.txt
index f73208bd269ad..db10e58190f7d 100644
--- a/tests/baselines/reference/importDeferInvalidDefault.errors.txt
+++ b/tests/baselines/reference/importDeferInvalidDefault.errors.txt
@@ -7,7 +7,7 @@ b.ts(1,8): error TS18058: Default imports are not allowed in a deferred import.
     }
     
 ==== b.ts (1 errors) ====
-    import defer foo from "./a";
+    import defer foo from "a";
            ~~~~~~~~~
 !!! error TS18058: Default imports are not allowed in a deferred import.
     
diff --git a/tests/baselines/reference/importDeferInvalidDefault.js b/tests/baselines/reference/importDeferInvalidDefault.js
index 1bcd8af7587e5..e0f3491c6329f 100644
--- a/tests/baselines/reference/importDeferInvalidDefault.js
+++ b/tests/baselines/reference/importDeferInvalidDefault.js
@@ -6,7 +6,7 @@ export default function foo() {
 }
 
 //// [b.ts]
-import defer foo from "./a";
+import defer foo from "a";
 
 foo();
 
@@ -15,5 +15,5 @@ export default function foo() {
     console.log("foo from a");
 }
 //// [b.js]
-import defer foo from "./a";
+import defer foo from "a";
 foo();
diff --git a/tests/baselines/reference/importDeferInvalidDefault.symbols b/tests/baselines/reference/importDeferInvalidDefault.symbols
index 34b190c10fa5b..dd548fc59340a 100644
--- a/tests/baselines/reference/importDeferInvalidDefault.symbols
+++ b/tests/baselines/reference/importDeferInvalidDefault.symbols
@@ -11,7 +11,7 @@ export default function foo() {
 }
 
 === b.ts ===
-import defer foo from "./a";
+import defer foo from "a";
 >foo : Symbol(foo, Decl(b.ts, 0, 6))
 
 foo();
diff --git a/tests/baselines/reference/importDeferInvalidDefault.types b/tests/baselines/reference/importDeferInvalidDefault.types
index 185ee3a294788..ae22c6fd8d417 100644
--- a/tests/baselines/reference/importDeferInvalidDefault.types
+++ b/tests/baselines/reference/importDeferInvalidDefault.types
@@ -19,7 +19,7 @@ export default function foo() {
 }
 
 === b.ts ===
-import defer foo from "./a";
+import defer foo from "a";
 >foo : () => void
 >    : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importDeferInvalidNamed.errors.txt b/tests/baselines/reference/importDeferInvalidNamed.errors.txt
index f802be536ffec..ef2015d6537b3 100644
--- a/tests/baselines/reference/importDeferInvalidNamed.errors.txt
+++ b/tests/baselines/reference/importDeferInvalidNamed.errors.txt
@@ -7,7 +7,7 @@ b.ts(1,8): error TS18059: Named imports are not allowed in a deferred import.
     }
     
 ==== b.ts (1 errors) ====
-    import defer { foo } from "./a";
+    import defer { foo } from "a";
            ~~~~~~~~~~~~~
 !!! error TS18059: Named imports are not allowed in a deferred import.
     
diff --git a/tests/baselines/reference/importDeferInvalidNamed.js b/tests/baselines/reference/importDeferInvalidNamed.js
index 925c583e31229..8f92f52fa0ee5 100644
--- a/tests/baselines/reference/importDeferInvalidNamed.js
+++ b/tests/baselines/reference/importDeferInvalidNamed.js
@@ -6,7 +6,7 @@ export function foo() {
 }
 
 //// [b.ts]
-import defer { foo } from "./a";
+import defer { foo } from "a";
 
 foo();
 
@@ -15,5 +15,5 @@ export function foo() {
     console.log("foo from a");
 }
 //// [b.js]
-import defer { foo } from "./a";
+import defer { foo } from "a";
 foo();
diff --git a/tests/baselines/reference/importDeferInvalidNamed.symbols b/tests/baselines/reference/importDeferInvalidNamed.symbols
index 83b170aa34388..77f3959cd7e06 100644
--- a/tests/baselines/reference/importDeferInvalidNamed.symbols
+++ b/tests/baselines/reference/importDeferInvalidNamed.symbols
@@ -11,7 +11,7 @@ export function foo() {
 }
 
 === b.ts ===
-import defer { foo } from "./a";
+import defer { foo } from "a";
 >foo : Symbol(foo, Decl(b.ts, 0, 14))
 
 foo();
diff --git a/tests/baselines/reference/importDeferInvalidNamed.types b/tests/baselines/reference/importDeferInvalidNamed.types
index ff761ef0b9d79..5568523603e08 100644
--- a/tests/baselines/reference/importDeferInvalidNamed.types
+++ b/tests/baselines/reference/importDeferInvalidNamed.types
@@ -19,7 +19,7 @@ export function foo() {
 }
 
 === b.ts ===
-import defer { foo } from "./a";
+import defer { foo } from "a";
 >foo : () => void
 >    : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importDeferNamespace(module=commonjs).js b/tests/baselines/reference/importDeferNamespace(module=commonjs).js
index 95cd4ac60d5dd..181c471732260 100644
--- a/tests/baselines/reference/importDeferNamespace(module=commonjs).js
+++ b/tests/baselines/reference/importDeferNamespace(module=commonjs).js
@@ -19,39 +19,6 @@ function foo() {
 }
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const aNs = __importStar(require("./a.js"));
+const aNs = require("./a.js");
 aNs.foo();
diff --git a/tests/baselines/reference/importDeferTypeConflict1.errors.txt b/tests/baselines/reference/importDeferTypeConflict1.errors.txt
index a97903b2cf730..138cfa68e9b36 100644
--- a/tests/baselines/reference/importDeferTypeConflict1.errors.txt
+++ b/tests/baselines/reference/importDeferTypeConflict1.errors.txt
@@ -12,7 +12,7 @@ b.ts(1,28): error TS2304: Cannot find name 'from'.
     }
     
 ==== b.ts (6 errors) ====
-    import type defer * as ns1 from "./a";
+    import type defer * as ns1 from "a";
                       ~
 !!! error TS1005: '=' expected.
                         ~~
diff --git a/tests/baselines/reference/importDeferTypeConflict1.js b/tests/baselines/reference/importDeferTypeConflict1.js
index 463ebf0241037..0577f6a08cb7c 100644
--- a/tests/baselines/reference/importDeferTypeConflict1.js
+++ b/tests/baselines/reference/importDeferTypeConflict1.js
@@ -6,7 +6,7 @@ export function foo() {
 }
 
 //// [b.ts]
-import type defer * as ns1 from "./a";
+import type defer * as ns1 from "a";
 
 
 //// [a.js]
@@ -17,4 +17,4 @@ export function foo() {
  * as;
 ns1;
 from;
-"./a";
+"a";
diff --git a/tests/baselines/reference/importDeferTypeConflict1.symbols b/tests/baselines/reference/importDeferTypeConflict1.symbols
index 9771ff173bdbf..961367f241e5b 100644
--- a/tests/baselines/reference/importDeferTypeConflict1.symbols
+++ b/tests/baselines/reference/importDeferTypeConflict1.symbols
@@ -11,6 +11,6 @@ export function foo() {
 }
 
 === b.ts ===
-import type defer * as ns1 from "./a";
+import type defer * as ns1 from "a";
 >defer : Symbol(defer, Decl(b.ts, 0, 0))
 
diff --git a/tests/baselines/reference/importDeferTypeConflict1.types b/tests/baselines/reference/importDeferTypeConflict1.types
index 770da70492fd5..ea2a7ef944685 100644
--- a/tests/baselines/reference/importDeferTypeConflict1.types
+++ b/tests/baselines/reference/importDeferTypeConflict1.types
@@ -19,7 +19,7 @@ export function foo() {
 }
 
 === b.ts ===
-import type defer * as ns1 from "./a";
+import type defer * as ns1 from "a";
 >defer : any
 >      : ^^^
 > : any
@@ -34,6 +34,6 @@ import type defer * as ns1 from "./a";
 >    : ^^^
 >from : any
 >     : ^^^
->"./a" : "./a"
->      : ^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/importDeferTypeConflict2.errors.txt b/tests/baselines/reference/importDeferTypeConflict2.errors.txt
index 6453749d15bd6..2387d3e34ac4e 100644
--- a/tests/baselines/reference/importDeferTypeConflict2.errors.txt
+++ b/tests/baselines/reference/importDeferTypeConflict2.errors.txt
@@ -12,7 +12,7 @@ b.ts(1,28): error TS2304: Cannot find name 'from'.
     }
     
 ==== b.ts (6 errors) ====
-    import defer type * as ns1 from "./a";
+    import defer type * as ns1 from "a";
                       ~
 !!! error TS1005: 'from' expected.
                       ~~~~
diff --git a/tests/baselines/reference/importDeferTypeConflict2.js b/tests/baselines/reference/importDeferTypeConflict2.js
index 393d7ff039cae..1c06d70469687 100644
--- a/tests/baselines/reference/importDeferTypeConflict2.js
+++ b/tests/baselines/reference/importDeferTypeConflict2.js
@@ -6,7 +6,7 @@ export function foo() {
 }
 
 //// [b.ts]
-import defer type * as ns1 from "./a";
+import defer type * as ns1 from "a";
 
 
 //// [a.js]
@@ -16,5 +16,5 @@ export function foo() {
 //// [b.js]
 ns1;
 from;
-"./a";
+"a";
 export {};
diff --git a/tests/baselines/reference/importDeferTypeConflict2.symbols b/tests/baselines/reference/importDeferTypeConflict2.symbols
index 699eea79269e6..ea867e3cfdc51 100644
--- a/tests/baselines/reference/importDeferTypeConflict2.symbols
+++ b/tests/baselines/reference/importDeferTypeConflict2.symbols
@@ -11,6 +11,6 @@ export function foo() {
 }
 
 === b.ts ===
-import defer type * as ns1 from "./a";
+import defer type * as ns1 from "a";
 >type : Symbol(type, Decl(b.ts, 0, 6))
 
diff --git a/tests/baselines/reference/importDeferTypeConflict2.types b/tests/baselines/reference/importDeferTypeConflict2.types
index 33b0d0cf855a4..bbcc915ad31bc 100644
--- a/tests/baselines/reference/importDeferTypeConflict2.types
+++ b/tests/baselines/reference/importDeferTypeConflict2.types
@@ -19,7 +19,7 @@ export function foo() {
 }
 
 === b.ts ===
-import defer type * as ns1 from "./a";
+import defer type * as ns1 from "a";
 >type : any
 >     : ^^^
 >* as : number
@@ -32,6 +32,6 @@ import defer type * as ns1 from "./a";
 >    : ^^^
 >from : any
 >     : ^^^
->"./a" : "./a"
->      : ^^^^^
+>"a" : "a"
+>    : ^^^
 
diff --git a/tests/baselines/reference/importEquals3.js b/tests/baselines/reference/importEquals3.js
index f00c2a09b15da..fa84a01466037 100644
--- a/tests/baselines/reference/importEquals3.js
+++ b/tests/baselines/reference/importEquals3.js
@@ -40,40 +40,7 @@ var x = 0;
 exports.x = x;
 //// [c.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var b = __importStar(require("./b"));
+var b = require("./b");
 var x = b.x;
 console.log(x);
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index 34b5f67f8c555..edc0aa2c58fa3 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -36,7 +36,7 @@ function id<T>(x: T) {
 
 const result = id`hello world`;
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/baselines/reference/importHelpers.symbols b/tests/baselines/reference/importHelpers.symbols
index 0deee4ae08814..b936b78e42a6e 100644
--- a/tests/baselines/reference/importHelpers.symbols
+++ b/tests/baselines/reference/importHelpers.symbols
@@ -76,52 +76,52 @@ const result = id`hello world`;
 >result : Symbol(result, Decl(script.ts, 15, 5))
 >id : Symbol(id, Decl(script.ts, 9, 1))
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
->__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
->d : Symbol(d, Decl(index.d.ts, 0, 34))
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->b : Symbol(b, Decl(index.d.ts, 0, 46))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(index.d.ts, 0, 66))
->t : Symbol(t, Decl(index.d.ts, 1, 33))
->sources : Symbol(sources, Decl(index.d.ts, 1, 40))
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
->__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
->decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->target : Symbol(target, Decl(index.d.ts, 2, 58))
->key : Symbol(key, Decl(index.d.ts, 2, 71))
->desc : Symbol(desc, Decl(index.d.ts, 2, 94))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
->__param : Symbol(__param, Decl(index.d.ts, 2, 112))
->paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32))
->decorator : Symbol(decorator, Decl(index.d.ts, 3, 51))
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
->__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83))
->metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35))
->metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52))
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
->__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83))
->thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34))
->_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47))
->P : Symbol(P, Decl(index.d.ts, 5, 64))
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->generator : Symbol(generator, Decl(index.d.ts, 5, 77))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __makeTemplateObject(cooked: string[], raw: string[]): TemplateStringsArray;
->__makeTemplateObject : Symbol(__makeTemplateObject, Decl(index.d.ts, 5, 104))
->cooked : Symbol(cooked, Decl(index.d.ts, 6, 45))
->raw : Symbol(raw, Decl(index.d.ts, 6, 62))
+>__makeTemplateObject : Symbol(__makeTemplateObject, Decl(tslib.d.ts, --, --))
+>cooked : Symbol(cooked, Decl(tslib.d.ts, --, --))
+>raw : Symbol(raw, Decl(tslib.d.ts, --, --))
 >TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/importHelpers.types b/tests/baselines/reference/importHelpers.types
index 56dbec9860293..d786b11dda4f9 100644
--- a/tests/baselines/reference/importHelpers.types
+++ b/tests/baselines/reference/importHelpers.types
@@ -102,7 +102,7 @@ const result = id`hello world`;
 >`hello world` : "hello world"
 >              : ^^^^^^^^^^^^^
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >          : ^ ^^        ^^ ^^        ^^^^^    
diff --git a/tests/baselines/reference/importHelpersAmd.errors.txt b/tests/baselines/reference/importHelpersAmd.errors.txt
deleted file mode 100644
index 81d8ceb204ef4..0000000000000
--- a/tests/baselines/reference/importHelpersAmd.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import { A } from "./a";
-    export * from "./a";
-    export class B extends A { }
-    
-==== tslib.d.ts (0 errors) ====
-    export declare function __extends(d: Function, b: Function): void;
-    export declare function __assign(t: any, ...sources: any[]): any;
-    export declare function __rest(t: any, propertyNames: string[]): any;
-    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-    export declare function __param(paramIndex: number, decorator: Function): Function;
-    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
-    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
-    export declare function __generator(thisArg: any, body: Function): any;
-    export declare function __exportStar(m: any, exports: any): void;
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersAmd.types b/tests/baselines/reference/importHelpersAmd.types
index 023575ad1fc83..29488bdd09573 100644
--- a/tests/baselines/reference/importHelpersAmd.types
+++ b/tests/baselines/reference/importHelpersAmd.types
@@ -30,7 +30,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
 >         : ^ ^^   ^^^^^       ^^     ^^^^^   
 >t : any
->  : ^^^
 >sources : any[]
 >        : ^^^^^
 
@@ -38,7 +37,6 @@ export declare function __rest(t: any, propertyNames: string[]): any;
 >__rest : (t: any, propertyNames: string[]) => any
 >       : ^ ^^   ^^             ^^        ^^^^^   
 >t : any
->  : ^^^
 >propertyNames : string[]
 >              : ^^^^^^^^
 
@@ -48,11 +46,9 @@ export declare function __decorate(decorators: Function[], target: any, key?: st
 >decorators : Function[]
 >           : ^^^^^^^^^^
 >target : any
->       : ^^^
 >key : string | symbol
 >    : ^^^^^^^^^^^^^^^
 >desc : any
->     : ^^^
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
 >__param : (paramIndex: number, decorator: Function) => Function
@@ -66,17 +62,13 @@ export declare function __metadata(metadataKey: any, metadataValue: any): Functi
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >           : ^           ^^   ^^             ^^   ^^^^^        
 >metadataKey : any
->            : ^^^
 >metadataValue : any
->              : ^^^
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >          : ^       ^^   ^^          ^^   ^^ ^^        ^^         ^^        ^^^^^   
 >thisArg : any
->        : ^^^
 >_arguments : any
->           : ^^^
 >P : Function
 >  : ^^^^^^^^
 >generator : Function
@@ -86,7 +78,6 @@ export declare function __generator(thisArg: any, body: Function): any;
 >__generator : (thisArg: any, body: Function) => any
 >            : ^       ^^   ^^    ^^        ^^^^^   
 >thisArg : any
->        : ^^^
 >body : Function
 >     : ^^^^^^^^
 
@@ -94,7 +85,5 @@ export declare function __exportStar(m: any, exports: any): void;
 >__exportStar : (m: any, exports: any) => void
 >             : ^ ^^   ^^       ^^   ^^^^^    
 >m : any
->  : ^^^
 >exports : any
->        : ^^^
 
diff --git a/tests/baselines/reference/importHelpersES6.errors.txt b/tests/baselines/reference/importHelpersES6.errors.txt
deleted file mode 100644
index 04b54604e2f05..0000000000000
--- a/tests/baselines/reference/importHelpersES6.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-a.ts(2,1): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
-
-
-==== a.ts (1 errors) ====
-    declare var dec: any;
-    @dec export class A {
-    ~~~~
-!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
-        #x: number = 1;
-        async f() { this.#x = await this.#x; }
-        g(u) { return #x in u; }
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
-==== tslib.d.ts (0 errors) ====
-    export declare function __extends(d: Function, b: Function): void;
-    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-    export declare function __param(paramIndex: number, decorator: Function): Function;
-    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
-    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
-    export declare function __classPrivateFieldGet(a: any, b: any, c: any, d: any): any;
-    export declare function __classPrivateFieldSet(a: any, b: any, c: any, d: any, e: any): any;
-    export declare function __classPrivateFieldIn(a: any, b: any): boolean;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersES6.types b/tests/baselines/reference/importHelpersES6.types
index d123080dc354c..918648cdbd0f9 100644
--- a/tests/baselines/reference/importHelpersES6.types
+++ b/tests/baselines/reference/importHelpersES6.types
@@ -3,11 +3,9 @@
 === a.ts ===
 declare var dec: any;
 >dec : any
->    : ^^^
 
 @dec export class A {
 >dec : any
->    : ^^^
 >A : A
 >  : ^
 
@@ -37,13 +35,10 @@ declare var dec: any;
 >g : (u: any) => u is A
 >  : ^ ^^^^^^^^^^^^^^^^
 >u : any
->  : ^^^
 >#x in u : boolean
 >        : ^^^^^^^
 >#x : any
->   : ^^^
 >u : any
->  : ^^^
 }
 
 const o = { a: 1 };
@@ -79,11 +74,9 @@ export declare function __decorate(decorators: Function[], target: any, key?: st
 >decorators : Function[]
 >           : ^^^^^^^^^^
 >target : any
->       : ^^^
 >key : string | symbol
 >    : ^^^^^^^^^^^^^^^
 >desc : any
->     : ^^^
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
 >__param : (paramIndex: number, decorator: Function) => Function
@@ -97,17 +90,13 @@ export declare function __metadata(metadataKey: any, metadataValue: any): Functi
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >           : ^           ^^   ^^             ^^   ^^^^^        
 >metadataKey : any
->            : ^^^
 >metadataValue : any
->              : ^^^
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >          : ^       ^^   ^^          ^^   ^^ ^^        ^^         ^^        ^^^^^   
 >thisArg : any
->        : ^^^
 >_arguments : any
->           : ^^^
 >P : Function
 >  : ^^^^^^^^
 >generator : Function
@@ -117,33 +106,22 @@ export declare function __classPrivateFieldGet(a: any, b: any, c: any, d: any):
 >__classPrivateFieldGet : (a: any, b: any, c: any, d: any) => any
 >                       : ^ ^^   ^^ ^^   ^^ ^^   ^^ ^^   ^^^^^   
 >a : any
->  : ^^^
 >b : any
->  : ^^^
 >c : any
->  : ^^^
 >d : any
->  : ^^^
 
 export declare function __classPrivateFieldSet(a: any, b: any, c: any, d: any, e: any): any;
 >__classPrivateFieldSet : (a: any, b: any, c: any, d: any, e: any) => any
 >                       : ^ ^^   ^^ ^^   ^^ ^^   ^^ ^^   ^^ ^^   ^^^^^   
 >a : any
->  : ^^^
 >b : any
->  : ^^^
 >c : any
->  : ^^^
 >d : any
->  : ^^^
 >e : any
->  : ^^^
 
 export declare function __classPrivateFieldIn(a: any, b: any): boolean;
 >__classPrivateFieldIn : (a: any, b: any) => boolean
 >                      : ^ ^^   ^^ ^^   ^^^^^       
 >a : any
->  : ^^^
 >b : any
->  : ^^^
 
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 2c771e83caf2d..884cfa84fe172 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -24,7 +24,7 @@ class C {
     }
 }
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.symbols b/tests/baselines/reference/importHelpersInIsolatedModules.symbols
index 356825cb37971..6b2d6e11a796c 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.symbols
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.symbols
@@ -48,46 +48,46 @@ class C {
     }
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
->__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
->d : Symbol(d, Decl(index.d.ts, 0, 34))
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->b : Symbol(b, Decl(index.d.ts, 0, 46))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(index.d.ts, 0, 66))
->t : Symbol(t, Decl(index.d.ts, 1, 33))
->sources : Symbol(sources, Decl(index.d.ts, 1, 40))
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
->__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
->decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->target : Symbol(target, Decl(index.d.ts, 2, 58))
->key : Symbol(key, Decl(index.d.ts, 2, 71))
->desc : Symbol(desc, Decl(index.d.ts, 2, 94))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
->__param : Symbol(__param, Decl(index.d.ts, 2, 112))
->paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32))
->decorator : Symbol(decorator, Decl(index.d.ts, 3, 51))
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
->__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83))
->metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35))
->metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52))
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
->__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83))
->thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34))
->_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47))
->P : Symbol(P, Decl(index.d.ts, 5, 64))
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->generator : Symbol(generator, Decl(index.d.ts, 5, 77))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.types b/tests/baselines/reference/importHelpersInIsolatedModules.types
index bcec951637ca5..85f1bbc2d93e5 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.types
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.types
@@ -60,7 +60,7 @@ class C {
     }
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >          : ^ ^^        ^^ ^^        ^^^^^    
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 230c81859a682..5005140e453aa 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -10,7 +10,7 @@ declare var React: any;
 declare var o: any;
 const x = <span {...o} />
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/baselines/reference/importHelpersInTsx.symbols b/tests/baselines/reference/importHelpersInTsx.symbols
index f5041b7d836c6..d5ba009e7f950 100644
--- a/tests/baselines/reference/importHelpersInTsx.symbols
+++ b/tests/baselines/reference/importHelpersInTsx.symbols
@@ -22,46 +22,46 @@ const x = <span {...o} />
 >x : Symbol(x, Decl(script.tsx, 2, 5))
 >o : Symbol(o, Decl(script.tsx, 1, 11))
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
->__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
->d : Symbol(d, Decl(index.d.ts, 0, 34))
+>__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
+>d : Symbol(d, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->b : Symbol(b, Decl(index.d.ts, 0, 46))
+>b : Symbol(b, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(index.d.ts, 0, 66))
->t : Symbol(t, Decl(index.d.ts, 1, 33))
->sources : Symbol(sources, Decl(index.d.ts, 1, 40))
+>__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
+>t : Symbol(t, Decl(tslib.d.ts, --, --))
+>sources : Symbol(sources, Decl(tslib.d.ts, --, --))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
->__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
->decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
+>decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->target : Symbol(target, Decl(index.d.ts, 2, 58))
->key : Symbol(key, Decl(index.d.ts, 2, 71))
->desc : Symbol(desc, Decl(index.d.ts, 2, 94))
+>target : Symbol(target, Decl(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
->__param : Symbol(__param, Decl(index.d.ts, 2, 112))
->paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32))
->decorator : Symbol(decorator, Decl(index.d.ts, 3, 51))
+>__param : Symbol(__param, Decl(tslib.d.ts, --, --))
+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
+>decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
->__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83))
->metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35))
->metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52))
+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --))
+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
->__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83))
->thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34))
->_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47))
->P : Symbol(P, Decl(index.d.ts, 5, 64))
+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
+>P : Symbol(P, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->generator : Symbol(generator, Decl(index.d.ts, 5, 77))
+>generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/tests/baselines/reference/importHelpersInTsx.types b/tests/baselines/reference/importHelpersInTsx.types
index b166d5cb97047..3d32a7cdead3b 100644
--- a/tests/baselines/reference/importHelpersInTsx.types
+++ b/tests/baselines/reference/importHelpersInTsx.types
@@ -28,7 +28,7 @@ const x = <span {...o} />
 >     : ^^^
 >o : any
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >          : ^ ^^        ^^ ^^        ^^^^^    
diff --git a/tests/baselines/reference/importHelpersNoHelpers.errors.txt b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
index 4c58dcf6c2063..47c053824e89c 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 external.ts(1,1): error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 external.ts(3,16): error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 external.ts(7,1): error TS2343: This syntax requires an imported helper named '__decorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
@@ -8,7 +7,6 @@ external.ts(14,13): error TS2343: This syntax requires an imported helper named
 external.ts(15,12): error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== external.ts (7 errors) ====
     export * from "./other";
     ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
index 652f4ef43c909..92a47c28a2fb0 100644
--- a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,25): error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(1,25): error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(1,25): error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
@@ -6,7 +5,6 @@ main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asy
 main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncValues' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (5 errors) ====
     export async function * f() {
                             ~
diff --git a/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.errors.txt b/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.errors.txt
index 57d046a360081..05586f6d42048 100644
--- a/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(4,9): error TS2343: This syntax requires an imported helper named '__classPrivateFieldSet' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(4,23): error TS2343: This syntax requires an imported helper named '__classPrivateFieldGet' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 main.ts(5,9): error TS2343: This syntax requires an imported helper named '__classPrivateFieldIn' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     export class Foo {
         #field = true;
diff --git a/tests/baselines/reference/importHelpersNoModule.errors.txt b/tests/baselines/reference/importHelpersNoModule.errors.txt
index ed5940d20f2e7..93d201ee1a591 100644
--- a/tests/baselines/reference/importHelpersNoModule.errors.txt
+++ b/tests/baselines/reference/importHelpersNoModule.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 external.ts(2,16): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== external.ts (1 errors) ====
     export class A { }
     export class B extends A { }
diff --git a/tests/baselines/reference/importHelpersOutFile.errors.txt b/tests/baselines/reference/importHelpersOutFile.errors.txt
deleted file mode 100644
index 10450e3f12f6c..0000000000000
--- a/tests/baselines/reference/importHelpersOutFile.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import { A } from "./a";
-    export class B extends A { }
-    
-==== c.ts (0 errors) ====
-    import { A } from "./a";
-    export class C extends A { }
-    
-==== tslib.d.ts (0 errors) ====
-    export declare function __extends(d: Function, b: Function): void;
-    export declare function __assign(t: any, ...sources: any[]): any;
-    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-    export declare function __param(paramIndex: number, decorator: Function): Function;
-    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
-    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersOutFile.types b/tests/baselines/reference/importHelpersOutFile.types
index 9bf61793f476f..af999d02b3515 100644
--- a/tests/baselines/reference/importHelpersOutFile.types
+++ b/tests/baselines/reference/importHelpersOutFile.types
@@ -40,7 +40,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
 >         : ^ ^^   ^^^^^       ^^     ^^^^^   
 >t : any
->  : ^^^
 >sources : any[]
 >        : ^^^^^
 
@@ -50,11 +49,9 @@ export declare function __decorate(decorators: Function[], target: any, key?: st
 >decorators : Function[]
 >           : ^^^^^^^^^^
 >target : any
->       : ^^^
 >key : string | symbol
 >    : ^^^^^^^^^^^^^^^
 >desc : any
->     : ^^^
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
 >__param : (paramIndex: number, decorator: Function) => Function
@@ -68,17 +65,13 @@ export declare function __metadata(metadataKey: any, metadataValue: any): Functi
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >           : ^           ^^   ^^             ^^   ^^^^^        
 >metadataKey : any
->            : ^^^
 >metadataValue : any
->              : ^^^
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >          : ^       ^^   ^^          ^^   ^^ ^^        ^^         ^^        ^^^^^   
 >thisArg : any
->        : ^^^
 >_arguments : any
->           : ^^^
 >P : Function
 >  : ^^^^^^^^
 >generator : Function
diff --git a/tests/baselines/reference/importHelpersSystem.errors.txt b/tests/baselines/reference/importHelpersSystem.errors.txt
deleted file mode 100644
index 55667298e5b17..0000000000000
--- a/tests/baselines/reference/importHelpersSystem.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import { A } from "./a";
-    export * from "./a";
-    export class B extends A { }
-    
-==== tslib.d.ts (0 errors) ====
-    export declare function __extends(d: Function, b: Function): void;
-    export declare function __assign(t: any, ...sources: any[]): any;
-    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-    export declare function __param(paramIndex: number, decorator: Function): Function;
-    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
-    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersSystem.types b/tests/baselines/reference/importHelpersSystem.types
index 270b9f92636b7..19c7d184d6df1 100644
--- a/tests/baselines/reference/importHelpersSystem.types
+++ b/tests/baselines/reference/importHelpersSystem.types
@@ -30,7 +30,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
 >         : ^ ^^   ^^^^^       ^^     ^^^^^   
 >t : any
->  : ^^^
 >sources : any[]
 >        : ^^^^^
 
@@ -40,11 +39,9 @@ export declare function __decorate(decorators: Function[], target: any, key?: st
 >decorators : Function[]
 >           : ^^^^^^^^^^
 >target : any
->       : ^^^
 >key : string | symbol
 >    : ^^^^^^^^^^^^^^^
 >desc : any
->     : ^^^
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
 >__param : (paramIndex: number, decorator: Function) => Function
@@ -58,17 +55,13 @@ export declare function __metadata(metadataKey: any, metadataValue: any): Functi
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >           : ^           ^^   ^^             ^^   ^^^^^        
 >metadataKey : any
->            : ^^^
 >metadataValue : any
->              : ^^^
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >          : ^       ^^   ^^          ^^   ^^ ^^        ^^         ^^        ^^^^^   
 >thisArg : any
->        : ^^^
 >_arguments : any
->           : ^^^
 >P : Function
 >  : ^^^^^^^^
 >generator : Function
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
deleted file mode 100644
index 141210d0665cd..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
deleted file mode 100644
index 8eee618e8764c..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).errors.txt
deleted file mode 100644
index 8eee618e8764c..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).errors.txt
deleted file mode 100644
index 8eee618e8764c..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
deleted file mode 100644
index 39c8e6d0d2a12..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt
deleted file mode 100644
index 58a5e5b8bdf6e..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).errors.txt
deleted file mode 100644
index 5293f7ed56503..0000000000000
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    export * as a from "./a";
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).types
index fe4d92dea23f2..4be4a9f98c18a 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).types
@@ -19,5 +19,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
deleted file mode 100644
index 9fdf9d0c057da..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt
deleted file mode 100644
index 8506104b70999..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).errors.txt
deleted file mode 100644
index 8506104b70999..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).errors.txt
deleted file mode 100644
index 8506104b70999..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
deleted file mode 100644
index fa3348a608424..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt
deleted file mode 100644
index 266be01be8043..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).errors.txt
deleted file mode 100644
index f64e9f067def7..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    export { default as a } from "./a";
-    import { default as b } from "./a";
-    void b;
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importDefault(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).types
index 6159bcfe75d2e..87423d8b5e802 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).types
@@ -36,5 +36,4 @@ declare module "tslib" {
 >__importDefault : (m: any) => void
 >                : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
deleted file mode 100644
index 6e988f05c114f..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=commonjs).errors.txt
deleted file mode 100644
index af7bff79a0635..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=commonjs).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2015).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2015).errors.txt
deleted file mode 100644
index af7bff79a0635..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2015).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2020).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2020).errors.txt
deleted file mode 100644
index af7bff79a0635..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2020).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
deleted file mode 100644
index 852516e62df99..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=amd).errors.txt
index 15142a1505510..8b3dc24776f8a 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=amd).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 b.ts(1,10): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export default class { }
     
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=system).errors.txt
deleted file mode 100644
index fad0b50808aed..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=system).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
deleted file mode 100644
index ee8cd804ecc33..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default as a } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=commonjs).errors.txt
deleted file mode 100644
index 588d25270f6e1..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=commonjs).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default as a } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2015).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2015).errors.txt
deleted file mode 100644
index 588d25270f6e1..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2015).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default as a } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2020).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2020).errors.txt
deleted file mode 100644
index 588d25270f6e1..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2020).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default as a } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
deleted file mode 100644
index eae445c8285d1..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default as a } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=amd).errors.txt
index cf11f6a24a59f..1db341fb3289c 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=amd).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 b.ts(1,10): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export default class { }
     
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=system).errors.txt
deleted file mode 100644
index 8d058056eeff8..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=system).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    export { default as a } from "./a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
deleted file mode 100644
index 8650f643f5fa6..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    import { default as b } from "./a";
-    void b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=commonjs).errors.txt
deleted file mode 100644
index 04869bb6fcb8d..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=commonjs).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    import { default as b } from "./a";
-    void b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2015).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2015).errors.txt
deleted file mode 100644
index 04869bb6fcb8d..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2015).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    import { default as b } from "./a";
-    void b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2020).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2020).errors.txt
deleted file mode 100644
index 04869bb6fcb8d..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2020).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    import { default as b } from "./a";
-    void b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
deleted file mode 100644
index d13aa2bb27c74..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    import { default as b } from "./a";
-    void b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=amd).errors.txt
index 176bf05ba7f5b..93314504ed7c5 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=amd).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 b.ts(1,10): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     export default class { }
     
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=system).errors.txt
deleted file mode 100644
index 138103b44592d..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=system).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export default class { }
-    
-==== b.ts (0 errors) ====
-    import { default as b } from "./a";
-    void b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
deleted file mode 100644
index 01b868c786d50..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
deleted file mode 100644
index 56569d9ad08ee..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).errors.txt
deleted file mode 100644
index 56569d9ad08ee..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).errors.txt
deleted file mode 100644
index 56569d9ad08ee..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
deleted file mode 100644
index 09917c6b0ff74..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt
deleted file mode 100644
index c51743ffe171a..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).errors.txt
deleted file mode 100644
index 102eafd56a8f3..0000000000000
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import * as a from "./a";
-    export { a };
-    
-==== tslib.d.ts (0 errors) ====
-    declare module "tslib" {
-        function __importStar(m: any): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).types
index 2ce2f7c7c6271..3f33963009f95 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).types
@@ -23,5 +23,4 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
->  : ^^^
 }
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).errors.txt b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).errors.txt
deleted file mode 100644
index 4275b79ce7fea..0000000000000
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-a.ts(2,1): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (1 errors) ====
-    declare var dec: any, __decorate: any;
-    @dec export class A {
-    ~~~~
-!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
-    
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
-==== node_modules/tslib/index.d.ts (0 errors) ====
-    export declare function __extends(d: Function, b: Function): void;
-    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-    export declare function __param(paramIndex: number, decorator: Function): Function;
-    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
-    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
index 2b80d8f0bc8b2..8cd41ea7a3e7c 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
@@ -9,7 +9,7 @@ declare var dec: any, __decorate: any;
 const o = { a: 1 };
 const y = { ...o };
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
index d0149baffbef5..adaba14dce798 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
@@ -9,7 +9,7 @@ declare var dec: any, __decorate: any;
 const o = { a: 1 };
 const y = { ...o };
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
index a974a5de5cf8f..ba22069c306f2 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
@@ -9,7 +9,7 @@ declare var dec: any, __decorate: any;
 const o = { a: 1 };
 const y = { ...o };
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).errors.txt b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).errors.txt
deleted file mode 100644
index c0c6ac22da1c2..0000000000000
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-a.ts(2,1): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (1 errors) ====
-    declare var dec: any, __decorate: any;
-    @dec export class A {
-    ~~~~
-!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
-    
-    }
-    
-    const o = { a: 1 };
-    const y = { ...o };
-    
-==== node_modules/tslib/index.d.ts (0 errors) ====
-    export declare function __extends(d: Function, b: Function): void;
-    export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-    export declare function __param(paramIndex: number, decorator: Function): Function;
-    export declare function __metadata(metadataKey: any, metadataValue: any): Function;
-    export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
index 2bbe62e910cc9..788e5ae4d8d46 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
@@ -9,7 +9,7 @@ declare var dec: any, __decorate: any;
 const o = { a: 1 };
 const y = { ...o };
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
diff --git a/tests/baselines/reference/importImportOnlyModule.errors.txt b/tests/baselines/reference/importImportOnlyModule.errors.txt
deleted file mode 100644
index c38af9ccb9190..0000000000000
--- a/tests/baselines/reference/importImportOnlyModule.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo_2.ts (0 errors) ====
-    import foo = require("./foo_1");
-    var x = foo; // Cause a runtime dependency
-    
-==== foo_0.ts (0 errors) ====
-    export class C1 {
-    	m1 = 42;
-    	static s1 = true;
-    }
-    
-==== foo_1.ts (0 errors) ====
-    import c1 = require('./foo_0'); // Makes this an external module
-    var answer = 42; // No exports
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt b/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
index a45105e6c9bcf..6cb04eae554d7 100644
--- a/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
 assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
 assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
@@ -9,7 +8,6 @@ scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-propert
 scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== example.ts (1 errors) ====
     // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
     (async () => {
diff --git a/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt b/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
index a45105e6c9bcf..6cb04eae554d7 100644
--- a/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
+++ b/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
 assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
 assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
@@ -9,7 +8,6 @@ scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-propert
 scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== example.ts (1 errors) ====
     // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
     (async () => {
diff --git a/tests/baselines/reference/importMetaNarrowing(module=system).errors.txt b/tests/baselines/reference/importMetaNarrowing(module=system).errors.txt
deleted file mode 100644
index 7f6610011e1d5..0000000000000
--- a/tests/baselines/reference/importMetaNarrowing(module=system).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== importMetaNarrowing.ts (0 errors) ====
-    declare global { interface ImportMeta {foo?: () => void} };
-    
-    if (import.meta.foo) {
-      import.meta.foo();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importNonExportedMember10.errors.txt b/tests/baselines/reference/importNonExportedMember10.errors.txt
index f65e55bf9471e..66f586f133f72 100644
--- a/tests/baselines/reference/importNonExportedMember10.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember10.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
 b.js(1,10): error TS2596: 'Foo' can only be imported by turning on the 'esModuleInterop' flag and using a default import.
 b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export.
 
 
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     class Foo {}
     export = Foo;
diff --git a/tests/baselines/reference/importNonExportedMember4.errors.txt b/tests/baselines/reference/importNonExportedMember4.errors.txt
index 121f087eb5301..d4294bc523496 100644
--- a/tests/baselines/reference/importNonExportedMember4.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember4.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 b.ts(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
 b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     class Foo {}
     export = Foo;
diff --git a/tests/baselines/reference/importNonExportedMember6.errors.txt b/tests/baselines/reference/importNonExportedMember6.errors.txt
index 886d7ae138a61..07938b7690319 100644
--- a/tests/baselines/reference/importNonExportedMember6.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember6.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
 b.ts(1,10): error TS2596: 'Foo' can only be imported by turning on the 'esModuleInterop' flag and using a default import.
 b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export.
 
 
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     class Foo {}
     export = Foo;
diff --git a/tests/baselines/reference/importNonExportedMember8.errors.txt b/tests/baselines/reference/importNonExportedMember8.errors.txt
index 9113b7056e5f0..6245d6dca6434 100644
--- a/tests/baselines/reference/importNonExportedMember8.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember8.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 b.js(1,10): error TS2598: 'Foo' can only be imported by using a 'require' call or by turning on the 'esModuleInterop' flag and using a default import.
 b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (0 errors) ====
     class Foo {}
     export = Foo;
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 7817daebbb9ea..d06f18002980a 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -19,9 +19,10 @@ var foo;
     foo.answer = 42;
 })(foo || (foo = {}));
 //// [foo_1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var foo = require("./foo_0");
-// Import should fail.  foo_0 not an external module
-if (foo.answer === 42) {
-}
+define(["require", "exports", "./foo_0"], function (require, exports, foo) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // Import should fail.  foo_0 not an external module
+    if (foo.answer === 42) {
+    }
+});
diff --git a/tests/baselines/reference/importNotElidedWhenNotFound.js b/tests/baselines/reference/importNotElidedWhenNotFound.js
index 8ef87404519cb..85f0d05b1c14f 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -36,12 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var file_1 = __importDefault(require("file"));
-var other_file_1 = __importDefault(require("other_file"));
+var file_1 = require("file");
+var other_file_1 = require("other_file");
 var Y = /** @class */ (function (_super) {
     __extends(Y, _super);
     function Y() {
@@ -49,8 +46,8 @@ var Y = /** @class */ (function (_super) {
     }
     return Y;
 }(other_file_1.default));
-var file2_1 = __importDefault(require("file2"));
-var file3_1 = __importDefault(require("file3"));
+var file2_1 = require("file2");
+var file3_1 = require("file3");
 var Q = /** @class */ (function (_super) {
     __extends(Q, _super);
     function Q() {
diff --git a/tests/baselines/reference/importShadowsGlobalName.errors.txt b/tests/baselines/reference/importShadowsGlobalName.errors.txt
deleted file mode 100644
index 39f345f4cfefb..0000000000000
--- a/tests/baselines/reference/importShadowsGlobalName.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== Bar.ts (0 errors) ====
-    import Error = require('Foo');
-    class Bar extends Error {}
-    export = Bar;
-==== Foo.ts (0 errors) ====
-    class Foo {}
-    export = Foo;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt b/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
deleted file mode 100644
index 8986a26bb0304..0000000000000
--- a/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a/b/c.ts (0 errors) ====
-    export interface Foo {
-        x: 12;
-    }
-==== a/inner.ts (0 errors) ====
-    const c: import("./b/c").Foo = {x: 12};
-    export {c};
-    
-==== index.ts (0 errors) ====
-    const d: typeof import("./a/inner")["c"] = {x: 12};
-    export {d};
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index 0f7a97ae5d8f1..c2b5ba82f0794 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -29,21 +29,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { aIndex: 0 };
 //// [test.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var _1 = __importDefault(require("."));
-var _2 = __importDefault(require("./"));
+var _1 = require(".");
+var _2 = require("./");
 _1.default.a;
 _2.default.aIndex;
 //// [test.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var __1 = __importDefault(require(".."));
-var __2 = __importDefault(require("../"));
+var __1 = require("..");
+var __2 = require("../");
 __1.default.a;
 __2.default.aIndex;
diff --git a/tests/baselines/reference/import_reference-exported-alias.errors.txt b/tests/baselines/reference/import_reference-exported-alias.errors.txt
deleted file mode 100644
index 83ee7312a7f92..0000000000000
--- a/tests/baselines/reference/import_reference-exported-alias.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file2.ts (0 errors) ====
-    import appJs = require("file1");
-    import Services = appJs.Services;
-    import UserServices = Services.UserServices;
-    var x = new UserServices().getUserName();
-    
-==== file1.ts (0 errors) ====
-    namespace App {
-        export namespace Services {
-            export class UserServices {
-                public getUserName(): string {
-                    return "Bill Gates";
-                }
-            }
-        }
-    }
-    
-    import Mod = App;
-    export = Mod;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/import_reference-to-type-alias.errors.txt b/tests/baselines/reference/import_reference-to-type-alias.errors.txt
deleted file mode 100644
index c2a56c65c3c83..0000000000000
--- a/tests/baselines/reference/import_reference-to-type-alias.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file2.ts (0 errors) ====
-    import appJs = require("file1");
-    import Services = appJs.App.Services;
-    var x = new Services.UserServices().getUserName();
-    
-==== file1.ts (0 errors) ====
-    export namespace App {
-        export namespace Services {
-            export class UserServices {
-                public getUserName(): string {
-                    return "Bill Gates";
-                }
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.errors.txt b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.errors.txt
deleted file mode 100644
index 30e51a1112342..0000000000000
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    /// <reference path="b.ts" />
-    import ITest = require('ITest');
-    var testData: ITest[];
-    var p = testData[0].name;
-     
-==== b.ts (0 errors) ====
-    declare module "ITest" {
-        interface Name {
-            name: string;
-        }
-        export = Name;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.errors.txt b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.errors.txt
deleted file mode 100644
index 35aa73efb55f6..0000000000000
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== consumer.ts (0 errors) ====
-    import host = require("host");
-    var hostVar = host;
-    var v = new hostVar.Host();
-     
-==== host.ts (0 errors) ====
-    export class Host { }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.errors.txt b/tests/baselines/reference/importedAliasesInTypePositions.errors.txt
deleted file mode 100644
index 403509739a312..0000000000000
--- a/tests/baselines/reference/importedAliasesInTypePositions.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file2.ts (0 errors) ====
-    import RT_ALIAS = require("file1");
-    import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo;
-    
-    export namespace ImportingModule {
-        class UsesReferredType {
-            constructor(private referred: ReferredTo) { }
-        }
-    }
-==== file1.ts (0 errors) ====
-    export namespace elaborate.nested.mod.name {
-        export class ReferredTo {
-            doSomething(): void {
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importedModuleClassNameClash.errors.txt b/tests/baselines/reference/importedModuleClassNameClash.errors.txt
deleted file mode 100644
index 1e6002bf6463a..0000000000000
--- a/tests/baselines/reference/importedModuleClassNameClash.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== importedModuleClassNameClash.ts (0 errors) ====
-    import foo = m1;
-     
-    export namespace m1 { }
-     
-    class foo { }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importedModuleClassNameClash.types b/tests/baselines/reference/importedModuleClassNameClash.types
index 847a0abb64866..5c51eb681617f 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.types
+++ b/tests/baselines/reference/importedModuleClassNameClash.types
@@ -4,8 +4,7 @@
 import foo = m1;
 >foo : typeof foo
 >    : ^^^^^^^^^^
->m1 : any
->   : ^^^
+>m1 : error
  
 export namespace m1 { }
  
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index e6ecbc218c8a8..8a75f2eb92dee 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -29,42 +29,9 @@ var y = 1;
 exports.y = y;
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
-var a1 = __importStar(require("./a"));
+var a1 = require("./a");
 var a2 = require("./a");
 var a3 = a1;
 a_1.x = 1; // Error
diff --git a/tests/baselines/reference/importsInAmbientModules1.errors.txt b/tests/baselines/reference/importsInAmbientModules1.errors.txt
deleted file mode 100644
index 6df82ef0b129b..0000000000000
--- a/tests/baselines/reference/importsInAmbientModules1.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== external.d.ts (0 errors) ====
-    export var x: number
-    
-==== main.ts (0 errors) ====
-    declare module "M" {
-        import {x} from "external"
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importsInAmbientModules2.errors.txt b/tests/baselines/reference/importsInAmbientModules2.errors.txt
deleted file mode 100644
index 478f04c3d80d0..0000000000000
--- a/tests/baselines/reference/importsInAmbientModules2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== external.d.ts (0 errors) ====
-    export default class C {}
-    
-==== main.ts (0 errors) ====
-    declare module "M" {
-        import C from "external"
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/importsInAmbientModules3.errors.txt b/tests/baselines/reference/importsInAmbientModules3.errors.txt
deleted file mode 100644
index 2f70e94171482..0000000000000
--- a/tests/baselines/reference/importsInAmbientModules3.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== main.ts (0 errors) ====
-    declare module "M" {
-        import C = require("external");
-    }
-==== external.d.ts (0 errors) ====
-    export default class C {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/inferredIndexerOnNamespaceImport.js b/tests/baselines/reference/inferredIndexerOnNamespaceImport.js
index d0f9a65b998e7..9c3d21e687ff0 100644
--- a/tests/baselines/reference/inferredIndexerOnNamespaceImport.js
+++ b/tests/baselines/reference/inferredIndexerOnNamespaceImport.js
@@ -21,41 +21,8 @@ exports.x = 3;
 exports.y = 5;
 //// [bar.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var foo = __importStar(require("./foo"));
+var foo = require("./foo");
 function f(map) {
     // ...
 }
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarations.js b/tests/baselines/reference/inlineJsxFactoryDeclarations.js
index 5e51999ffd948..5502aab07c81a 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarations.js
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarations.js
@@ -39,42 +39,9 @@ export * from "./reacty";
 
 //// [otherreacty.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @jsx React.createElement */
-var React = __importStar(require("./renderer"));
+var React = require("./renderer");
 React.createElement("h", null);
 //// [other.js]
 "use strict";
@@ -92,12 +59,9 @@ var renderer_1 = require("./renderer");
 exports.prerendered2 = (0, renderer_1.otherdom)("h", null);
 //// [reacty.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prerendered3 = void 0;
-var renderer_1 = __importDefault(require("./renderer"));
+var renderer_1 = require("./renderer");
 exports.prerendered3 = renderer_1.default.createElement("h", null);
 //// [index.js]
 "use strict";
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.js b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.js
index 7ac07c7d2aba5..7ec66f8200b27 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.js
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.js
@@ -129,39 +129,6 @@ exports.tree = (0, renderer2_1.predom)(exports.MySFC, { x: 1, y: 2 },
 exports.default = (0, renderer2_1.predom)("h", null);
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -174,7 +141,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @jsx dom */
 var renderer_1 = require("./renderer");
-var component_1 = __importStar(require("./component"));
+var component_1 = require("./component");
 var elem = component_1.default;
 elem = (0, renderer_1.dom)("h", null); // Expect assignability error here
 var DOMSFC = function (props) { return (0, renderer_1.dom)("p", null,
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js
index 2e4ba7347f8d4..577f482b3eaf3 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js
@@ -53,12 +53,9 @@ var renderer2_1 = require("./renderer2");
 exports.default = (0, renderer2_1.predom)("h", null);
 //// [index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @jsx dom */
 var renderer_1 = require("./renderer");
-var component_1 = __importDefault(require("./component"));
+var component_1 = require("./component");
 var elem = component_1.default;
 elem = (0, renderer_1.dom)("h", null); // Expect assignability error here
diff --git a/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.js b/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.js
index 7e84df6d0165b..f68d91318c565 100644
--- a/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.js
+++ b/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.js
@@ -21,42 +21,9 @@ import { dom } from "./renderer";
 
 //// [reacty.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @jsx React.createElement */
-var React = __importStar(require("./renderer"));
+var React = require("./renderer");
 React.createElement(React.Fragment, null,
     React.createElement("h", null));
 //// [index.js]
diff --git a/tests/baselines/reference/instanceOfInExternalModules.errors.txt b/tests/baselines/reference/instanceOfInExternalModules.errors.txt
deleted file mode 100644
index e611dcf5b41d2..0000000000000
--- a/tests/baselines/reference/instanceOfInExternalModules.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== instanceOfInExternalModules_1.ts (0 errors) ====
-    ///<reference path='instanceOfInExternalModules_require.ts'/>
-    import Bar = require("instanceOfInExternalModules_require");
-    function IsFoo(value: any): boolean {
-        return value instanceof Bar.Foo;
-    }
-    
-==== instanceOfInExternalModules_require.ts (0 errors) ====
-    export class Foo { foo: string; }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/instanceOfInExternalModules.types b/tests/baselines/reference/instanceOfInExternalModules.types
index 4e025843be762..1642925bc3d41 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.types
+++ b/tests/baselines/reference/instanceOfInExternalModules.types
@@ -10,13 +10,11 @@ function IsFoo(value: any): boolean {
 >IsFoo : (value: any) => boolean
 >      : ^     ^^   ^^^^^       
 >value : any
->      : ^^^
 
     return value instanceof Bar.Foo;
 >value instanceof Bar.Foo : boolean
 >                         : ^^^^^^^
 >value : any
->      : ^^^
 >Bar.Foo : typeof Bar.Foo
 >        : ^^^^^^^^^^^^^^
 >Bar : typeof Bar
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index 9d0c5fff0e313..0e9d8a0f2efe0 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,11 +58,56 @@ interface I2 extends I1 { item:string; }
 
 
 //// [interfaceDeclaration3.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.M2 = void 0;
-var M1;
-(function (M1) {
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.M2 = void 0;
+    var M1;
+    (function (M1) {
+        var C1 = /** @class */ (function () {
+            function C1() {
+            }
+            return C1;
+        }());
+        var C2 = /** @class */ (function () {
+            function C2() {
+            }
+            return C2;
+        }());
+        var C3 = /** @class */ (function () {
+            function C3() {
+            }
+            return C3;
+        }());
+        var C4 = /** @class */ (function () {
+            function C4() {
+            }
+            return C4;
+        }());
+        var C5 = /** @class */ (function () {
+            function C5() {
+            }
+            return C5;
+        }());
+    })(M1 || (M1 = {}));
+    var M2;
+    (function (M2) {
+        var C1 = /** @class */ (function () {
+            function C1() {
+            }
+            return C1;
+        }());
+        var C2 = /** @class */ (function () {
+            function C2() {
+            }
+            return C2;
+        }());
+        var C3 = /** @class */ (function () {
+            function C3() {
+            }
+            return C3;
+        }());
+    })(M2 || (exports.M2 = M2 = {}));
     var C1 = /** @class */ (function () {
         function C1() {
         }
@@ -78,47 +123,4 @@ var M1;
         }
         return C3;
     }());
-    var C4 = /** @class */ (function () {
-        function C4() {
-        }
-        return C4;
-    }());
-    var C5 = /** @class */ (function () {
-        function C5() {
-        }
-        return C5;
-    }());
-})(M1 || (M1 = {}));
-var M2;
-(function (M2) {
-    var C1 = /** @class */ (function () {
-        function C1() {
-        }
-        return C1;
-    }());
-    var C2 = /** @class */ (function () {
-        function C2() {
-        }
-        return C2;
-    }());
-    var C3 = /** @class */ (function () {
-        function C3() {
-        }
-        return C3;
-    }());
-})(M2 || (exports.M2 = M2 = {}));
-var C1 = /** @class */ (function () {
-    function C1() {
-    }
-    return C1;
-}());
-var C2 = /** @class */ (function () {
-    function C2() {
-    }
-    return C2;
-}());
-var C3 = /** @class */ (function () {
-    function C3() {
-    }
-    return C3;
-}());
+});
diff --git a/tests/baselines/reference/interfaceDeclaration5.errors.txt b/tests/baselines/reference/interfaceDeclaration5.errors.txt
deleted file mode 100644
index 186a9195e22f3..0000000000000
--- a/tests/baselines/reference/interfaceDeclaration5.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== interfaceDeclaration5.ts (0 errors) ====
-    export interface I1 { item:string; }
-    export class C1 { }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 9e088a1576112..485665af39084 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,29 +27,31 @@ export class Test {
 
 
 //// [interfaceImplementation6.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Test = void 0;
-var C1 = /** @class */ (function () {
-    function C1() {
-    }
-    return C1;
-}());
-var C2 = /** @class */ (function () {
-    function C2() {
-    }
-    return C2;
-}());
-var C3 = /** @class */ (function () {
-    function C3() {
-        var item;
-    }
-    return C3;
-}());
-var Test = /** @class */ (function () {
-    function Test() {
-        this.pt = { item: 1 };
-    }
-    return Test;
-}());
-exports.Test = Test;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.Test = void 0;
+    var C1 = /** @class */ (function () {
+        function C1() {
+        }
+        return C1;
+    }());
+    var C2 = /** @class */ (function () {
+        function C2() {
+        }
+        return C2;
+    }());
+    var C3 = /** @class */ (function () {
+        function C3() {
+            var item;
+        }
+        return C3;
+    }());
+    var Test = /** @class */ (function () {
+        function Test() {
+            this.pt = { item: 1 };
+        }
+        return Test;
+    }());
+    exports.Test = Test;
+});
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
deleted file mode 100644
index 0e32f6de63ea9..0000000000000
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasEnumInsideTopLevelModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export enum weekend {
-            Friday,
-            Saturday,
-            Sunday
-        }
-    }
-    
-    export import b = a.weekend;
-    export var bVal: b = b.Sunday;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
deleted file mode 100644
index e298ad48de0a9..0000000000000
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasEnumInsideTopLevelModuleWithoutExport.ts (0 errors) ====
-    export namespace a {
-        export enum weekend {
-            Friday,
-            Saturday,
-            Sunday
-        }
-    }
-    
-    import b = a.weekend;
-    export var bVal: b = b.Sunday;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
deleted file mode 100644
index 87dffa8304ed4..0000000000000
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasFunctionInsideTopLevelModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export function foo(x: number) {
-            return x;
-        }
-    }
-    
-    export import b = a.foo;
-    export var bVal = b(10);
-    export var bVal2 = b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
deleted file mode 100644
index 8fe0f70788ede..0000000000000
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasInitializedModuleInsideLocalModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export namespace b {
-            export class c {
-            }
-        }
-    }
-    
-    export namespace c {
-        export import b = a.b;
-        export var x: b.c = new b.c();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
deleted file mode 100644
index a4016a8b13c25..0000000000000
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts (0 errors) ====
-    export namespace a {
-        export namespace b {
-            export class c {
-            }
-        }
-    }
-    
-    import b = a.b;
-    export var x: b.c = new b.c();
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
deleted file mode 100644
index aa8213b6a2dca..0000000000000
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasInterfaceInsideLocalModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export interface I {
-        }
-    }
-    
-    export namespace c {
-        export import b = a.I;
-        export var x: b;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
deleted file mode 100644
index e8c184fc74084..0000000000000
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasInterfaceInsideLocalModuleWithoutExport.ts (0 errors) ====
-    export namespace a {
-        export interface I {
-        }
-    }
-    
-    export namespace c {
-        import b = a.I;
-        export var x: b;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index e367c1bfc0d25..cdc041a4a9660 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -14,10 +14,12 @@ export namespace c {
 var x: c.b;
 
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.c = void 0;
-var c;
-(function (c) {
-})(c || (exports.c = c = {}));
-var x;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.c = void 0;
+    var c;
+    (function (c) {
+    })(c || (exports.c = c = {}));
+    var x;
+});
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
deleted file mode 100644
index 8d4452ecab01f..0000000000000
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts (0 errors) ====
-    export namespace a {
-        export interface I {
-        }
-    }
-    
-    import b = a.I;
-    export var x: b;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index a08dcb4ac9e2d..788ac8ef70e01 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -19,10 +19,12 @@ export namespace c {
 export var z: c.b.I;
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.z = exports.c = void 0;
-var c;
-(function (c) {
-    c.x.foo();
-})(c || (exports.c = c = {}));
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.z = exports.c = void 0;
+    var c;
+    (function (c) {
+        c.x.foo();
+    })(c || (exports.c = c = {}));
+});
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
deleted file mode 100644
index 09fb81b94ad55..0000000000000
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export namespace b {
-            export interface I {
-                foo();
-            }
-        }
-    }
-    
-    export import b = a.b;
-    export var x: b.I;
-    x.foo();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
index 524e74c7b134c..fb26b65095e65 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
@@ -27,7 +27,6 @@ export var x: b.I;
 
 x.foo();
 >x.foo() : any
->        : ^^^
 >x.foo : () => any
 >      : ^^^^^^^^^
 >x : b.I
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
deleted file mode 100644
index 2ba14d11d724b..0000000000000
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasVarInsideLocalModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export var x = 10;
-    }
-    
-    export namespace c {
-        export import b = a.x;
-        export var bVal = b;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
deleted file mode 100644
index afe281be9a989..0000000000000
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasVarInsideLocalModuleWithoutExport.ts (0 errors) ====
-    export namespace a {
-        export var x = 10;
-    }
-    
-    export namespace c {
-        import b = a.x;
-        export var bVal = b;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
deleted file mode 100644
index a634e250de0da..0000000000000
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internalAliasVarInsideTopLevelModuleWithExport.ts (0 errors) ====
-    export namespace a {
-        export var x = 10;
-    }
-    
-    export import b = a.x;
-    export var bVal = b;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidSyntaxNamespaceImportWithAMD.errors.txt b/tests/baselines/reference/invalidSyntaxNamespaceImportWithAMD.errors.txt
index 5bf88b00ce72f..04835e73eb209 100644
--- a/tests/baselines/reference/invalidSyntaxNamespaceImportWithAMD.errors.txt
+++ b/tests/baselines/reference/invalidSyntaxNamespaceImportWithAMD.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(1,10): error TS1005: 'as' expected.
 1.ts(1,15): error TS1005: 'from' expected.
 1.ts(1,15): error TS1141: String literal expected.
 1.ts(1,20): error TS1005: ';' expected.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export class C { }
     
diff --git a/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js b/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js
index 9028905ff5ff0..a6fe8a712c62c 100644
--- a/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js
+++ b/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js
@@ -18,40 +18,7 @@ var C = /** @class */ (function () {
 exports.C = C;
 //// [1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var from = __importStar(require());
+var from = require();
 from;
 "./0";
diff --git a/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt b/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt
index ca4f0308ec1e7..04835e73eb209 100644
--- a/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt
+++ b/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(1,10): error TS1005: 'as' expected.
 1.ts(1,15): error TS1005: 'from' expected.
 1.ts(1,15): error TS1141: String literal expected.
 1.ts(1,20): error TS1005: ';' expected.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.ts (0 errors) ====
     export class C { }
     
diff --git a/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt b/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
deleted file mode 100644
index 3db3e59dd3df9..0000000000000
--- a/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A {
-        toUpper(msg: string): string {
-            return msg.toUpperCase();
-        }
-    }
-    
-==== b.ts (0 errors) ====
-    import { A } from "./a";
-    
-    export class B extends A {
-        toFixed(n: number): string {
-            return n.toFixed(6);
-        }
-    }
-    
-    export function makeB(): A {
-        return new B();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesExportDeclarationType.js b/tests/baselines/reference/isolatedModulesExportDeclarationType.js
index 8da57aaa78435..7ab2b29c06cd1 100644
--- a/tests/baselines/reference/isolatedModulesExportDeclarationType.js
+++ b/tests/baselines/reference/isolatedModulesExportDeclarationType.js
@@ -39,10 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [test4.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-expect-error
-var doesntexist_1 = __importDefault(require("./doesntexist"));
+var doesntexist_1 = require("./doesntexist");
 exports.default = doesntexist_1.default;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index 10a8ad8d88dce..a441a3f7d21f3 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -31,44 +31,11 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.z = exports.c1 = void 0;
 var module_1 = require("module");
 var module_2 = require("module");
-var ns = __importStar(require("module"));
+var ns = require("module");
 var C = /** @class */ (function (_super) {
     __extends(C, _super);
     function C() {
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt b/tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt
deleted file mode 100644
index 446077b024f6d..0000000000000
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== isolatedModulesPlainFile-AMD.ts (0 errors) ====
-    declare function run(a: number): void;
-    run(1);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-System.errors.txt b/tests/baselines/reference/isolatedModulesPlainFile-System.errors.txt
deleted file mode 100644
index 39a0a212feeda..0000000000000
--- a/tests/baselines/reference/isolatedModulesPlainFile-System.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== isolatedModulesPlainFile-System.ts (0 errors) ====
-    declare function run(a: number): void;
-    run(1);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.errors.txt b/tests/baselines/reference/isolatedModulesPlainFile-UMD.errors.txt
deleted file mode 100644
index 4628c31cb408a..0000000000000
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== isolatedModulesPlainFile-UMD.ts (0 errors) ====
-    declare function run(a: number): void;
-    run(1);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesReExportType.js b/tests/baselines/reference/isolatedModulesReExportType.js
index 2f545f306bcff..6c439271777ba 100644
--- a/tests/baselines/reference/isolatedModulesReExportType.js
+++ b/tests/baselines/reference/isolatedModulesReExportType.js
@@ -73,44 +73,11 @@ exports.C = C;
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [user.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NS = exports.C = void 0;
 // OK, has a value side
 var exportValue_1 = require("./exportValue");
 Object.defineProperty(exports, "C", { enumerable: true, get: function () { return exportValue_1.C; } });
 // OK, even though the namespace it exports is only types.
-var NS = __importStar(require("./exportT"));
+var NS = require("./exportT");
 exports.NS = NS;
diff --git a/tests/baselines/reference/jsDeclarationsDefault.js b/tests/baselines/reference/jsDeclarationsDefault.js
index 5d56177c3ef42..4357bdd55759e 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -84,11 +84,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var index3_1 = __importDefault(require("./index3"));
+var index3_1 = require("./index3");
 var Bar = /** @class */ (function (_super) {
     __extends(Bar, _super);
     function Bar() {
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.js b/tests/baselines/reference/jsDeclarationsExportForms.js
index 3300bfe12fafa..133e66706bbca 100644
--- a/tests/baselines/reference/jsDeclarationsExportForms.js
+++ b/tests/baselines/reference/jsDeclarationsExportForms.js
@@ -118,119 +118,20 @@ var cls_1 = require("./cls");
 Object.defineProperty(exports, "Foo", { enumerable: true, get: function () { return cls_1.Foo; } });
 //// [bat.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ns = __importStar(require("./cls"));
+var ns = require("./cls");
 exports.default = ns;
 //// [ban.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ns = void 0;
-var ns = __importStar(require("./cls"));
+var ns = require("./cls");
 exports.ns = ns;
 //// [bol.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.classContainer = void 0;
-var ns = __importStar(require("./cls"));
+var ns = require("./cls");
 exports.classContainer = ns;
 //// [cjs.js]
 var ns = require("./cls");
diff --git a/tests/baselines/reference/jsDeclarationsExportFormsErr.js b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
index e9ea1d3873f19..508ee7828f408 100644
--- a/tests/baselines/reference/jsDeclarationsExportFormsErr.js
+++ b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
@@ -37,41 +37,8 @@ var ns = require("./cls");
 module.exports = ns;
 //// [bin.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ns = __importStar(require("./cls"));
+var ns = require("./cls");
 module.exports = ns; // We refuse to bind cjs module exports assignments in the same file we find an import in
 //// [globalNs.js]
 "use strict";
diff --git a/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt b/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
deleted file mode 100644
index 2c8a21b54d7a2..0000000000000
--- a/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== folder/mod1.js (0 errors) ====
-    /**
-     * @typedef {{x: number}} Item
-     */
-    /**
-     * @type {Item};
-     */
-    const x = {x: 12};
-    module.exports = x;
-==== index.js (0 errors) ====
-    /** @type {(typeof import("./folder/mod1"))[]} */
-    const items = [{x: 12}];
-    module.exports = items;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsReexportAliases.js b/tests/baselines/reference/jsDeclarationsReexportAliases.js
index 3c89ac9534eb5..b33fb47c67b3c 100644
--- a/tests/baselines/reference/jsDeclarationsReexportAliases.js
+++ b/tests/baselines/reference/jsDeclarationsReexportAliases.js
@@ -22,15 +22,12 @@ var Foo = /** @class */ (function () {
 exports.default = Foo;
 //// [usage.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Foob = exports.x = void 0;
-var cls_1 = __importDefault(require("./cls"));
+var cls_1 = require("./cls");
 exports.x = new cls_1.default();
 var cls_2 = require("./cls");
-Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return __importDefault(cls_2).default; } });
+Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return cls_2.default; } });
 
 
 //// [cls.d.ts]
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
deleted file mode 100644
index caaae70c3ac3e..0000000000000
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== _apply.js (0 errors) ====
-    /**
-     * A faster alternative to `Function#apply`, this function invokes `func`
-     * with the `this` binding of `thisArg` and the arguments of `args`.
-     *
-     * @private
-     * @param {Function} func The function to invoke.
-     * @param {*} thisArg The `this` binding of `func`.
-     * @param {...*} args The arguments to invoke `func` with.
-     * @returns {*} Returns the result of `func`.
-     */
-    function apply(func, thisArg, ...args) {
-        var length = args.length;
-        switch (length) {
-            case 0: return func.call(thisArg);
-            case 1: return func.call(thisArg, args[0]);
-            case 2: return func.call(thisArg, args[0], args[1]);
-            case 3: return func.call(thisArg, args[0], args[1], args[2]);
-        }
-        return func.apply(thisArg, args);
-    }
-    
-    export default apply;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
index 2a91f1f7cc057..27985ba64217c 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
@@ -17,7 +17,6 @@ function apply(func, thisArg, ...args) {
 >func : Function
 >     : ^^^^^^^^
 >thisArg : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 
@@ -39,7 +38,6 @@ function apply(func, thisArg, ...args) {
 >0 : 0
 >  : ^
 >func.call(thisArg) : any
->                   : ^^^
 >func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >          : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >func : Function
@@ -47,13 +45,11 @@ function apply(func, thisArg, ...args) {
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >     : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >thisArg : any
->        : ^^^
 
         case 1: return func.call(thisArg, args[0]);
 >1 : 1
 >  : ^
 >func.call(thisArg, args[0]) : any
->                            : ^^^
 >func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >          : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >func : Function
@@ -61,9 +57,7 @@ function apply(func, thisArg, ...args) {
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >     : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >thisArg : any
->        : ^^^
 >args[0] : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 >0 : 0
@@ -73,7 +67,6 @@ function apply(func, thisArg, ...args) {
 >2 : 2
 >  : ^
 >func.call(thisArg, args[0], args[1]) : any
->                                     : ^^^
 >func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >          : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >func : Function
@@ -81,15 +74,12 @@ function apply(func, thisArg, ...args) {
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >     : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >thisArg : any
->        : ^^^
 >args[0] : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 >0 : 0
 >  : ^
 >args[1] : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 >1 : 1
@@ -99,7 +89,6 @@ function apply(func, thisArg, ...args) {
 >3 : 3
 >  : ^
 >func.call(thisArg, args[0], args[1], args[2]) : any
->                                              : ^^^
 >func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >          : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >func : Function
@@ -107,21 +96,17 @@ function apply(func, thisArg, ...args) {
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >     : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >thisArg : any
->        : ^^^
 >args[0] : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 >0 : 0
 >  : ^
 >args[1] : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 >1 : 1
 >  : ^
 >args[2] : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 >2 : 2
@@ -129,7 +114,6 @@ function apply(func, thisArg, ...args) {
     }
     return func.apply(thisArg, args);
 >func.apply(thisArg, args) : any
->                          : ^^^
 >func.apply : (this: Function, thisArg: any, argArray?: any) => any
 >           : ^    ^^        ^^       ^^   ^^        ^^^   ^^^^^   
 >func : Function
@@ -137,7 +121,6 @@ function apply(func, thisArg, ...args) {
 >apply : (this: Function, thisArg: any, argArray?: any) => any
 >      : ^    ^^        ^^       ^^   ^^        ^^^   ^^^^^   
 >thisArg : any
->        : ^^^
 >args : any[]
 >     : ^^^^^
 }
diff --git a/tests/baselines/reference/jsdocInTypeScript.js b/tests/baselines/reference/jsdocInTypeScript.js
index f8125c67c3b62..93d8340145c90 100644
--- a/tests/baselines/reference/jsdocInTypeScript.js
+++ b/tests/baselines/reference/jsdocInTypeScript.js
@@ -60,39 +60,6 @@ var v = import(String());
 
 
 //// [jsdocInTypeScript.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var T = /** @class */ (function () {
     function T() {
     }
@@ -127,4 +94,4 @@ var E = {};
 E[""];
 // make sure import types in JSDoc are not resolved
 /** @type {import("should-not-be-resolved").Type} */
-var v = Promise.resolve("".concat(String())).then(function (s) { return __importStar(require(s)); });
+var v = Promise.resolve("".concat(String())).then(function (s) { return require(s); });
diff --git a/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js b/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
index 0338e0385f24c..5a647375a5168 100644
--- a/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
+++ b/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
@@ -18,42 +18,9 @@ export const Hoc = <Tag extends Tags>(
 //// [jsxCallElaborationCheckNoCrash1.js]
 "use strict";
 /// <reference path="react16.d.ts" />
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hoc = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var Hoc = function (TagElement) {
     var Component = function () { return React.createElement(TagElement, null); };
     return Component;
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
index 15e2270ab7206..34a07d6698d4a 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
@@ -20,41 +20,8 @@ let x = <MyComp<Prop> a={10} b="hi" />; // error, no type arguments in js
 
 //// [file.jsx]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("./component");
-var React = __importStar(require("react"));
+var React = require("react");
 var x = <component_1.MyComp />, <component_1.Prop> a={10} b="hi" />; // error, no type arguments in js
 </>;
diff --git a/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js b/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
index bfdb778a1586d..94f8216e6ba56 100644
--- a/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
+++ b/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
@@ -80,45 +80,12 @@ var a = <Blah3>
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Blah = Blah;
 exports.Blah2 = Blah2;
 exports.Blah3 = Blah3;
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 function Blah(props) {
     return React.createElement(React.Fragment, null);
 }
diff --git a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
index 83121c9f7e887..aad5c33295277 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -44,42 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.App = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 function TabLayout(props) {
     return React.createElement("div", null);
 }
diff --git a/tests/baselines/reference/jsxClassAttributeResolution.errors.txt b/tests/baselines/reference/jsxClassAttributeResolution.errors.txt
index acbf1c2b1b062..354df1ee641a2 100644
--- a/tests/baselines/reference/jsxClassAttributeResolution.errors.txt
+++ b/tests/baselines/reference/jsxClassAttributeResolution.errors.txt
@@ -12,7 +12,7 @@ file.tsx(2,19): error TS2741: Property 'ref' is missing in type '{}' but require
         "name": "@types/react",
         "version": "0.0.1",
         "main": "",
-        "types": "index.d.ts"
+        "types": "index.d.ts",
     }
 ==== node_modules/@types/react/index.d.ts (0 errors) ====
     interface IntrinsicClassAttributesAlias<T> {
diff --git a/tests/baselines/reference/jsxClassAttributeResolution.js b/tests/baselines/reference/jsxClassAttributeResolution.js
index 7169f506028bc..7fa77a36324a3 100644
--- a/tests/baselines/reference/jsxClassAttributeResolution.js
+++ b/tests/baselines/reference/jsxClassAttributeResolution.js
@@ -8,7 +8,7 @@ export const a = <App></App>;
     "name": "@types/react",
     "version": "0.0.1",
     "main": "",
-    "types": "index.d.ts"
+    "types": "index.d.ts",
 }
 //// [index.d.ts]
 interface IntrinsicClassAttributesAlias<T> {
diff --git a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
index b5a82fb9e4447..222e446dd0d90 100644
--- a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
+++ b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
@@ -624,42 +624,9 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReactSingleSelect = createReactSingleSelect;
-var React = __importStar(require("react"));
+var React = require("react");
 function createReactSingleSelect(WrappedComponent) {
     return function (props) {
         return (React.createElement(ReactSelectClass, __assign({}, props, { multi: false, autosize: false, value: props.value, onChange: function (value) {
diff --git a/tests/baselines/reference/jsxElementType.js b/tests/baselines/reference/jsxElementType.js
index 33b9bfa9d2d19..6d8349d54728a 100644
--- a/tests/baselines/reference/jsxElementType.js
+++ b/tests/baselines/reference/jsxElementType.js
@@ -131,39 +131,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -202,7 +169,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 var Component;
 var RenderElement = function (_a) {
     var title = _a.title;
diff --git a/tests/baselines/reference/jsxElementTypeLiteral.js b/tests/baselines/reference/jsxElementTypeLiteral.js
index 76e163485d026..127af9dd5f969 100644
--- a/tests/baselines/reference/jsxElementTypeLiteral.js
+++ b/tests/baselines/reference/jsxElementTypeLiteral.js
@@ -25,42 +25,9 @@ let c = <ruhroh />;
 
 //// [jsxElementTypeLiteral.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 // should be fine - `ElementType` accepts `div`
 var a = React.createElement("div", null);
 // should be an error - `ElementType` does not accept `span`
diff --git a/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js b/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
index 6fd1e77e2c1ae..da5631af1b8fd 100644
--- a/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
+++ b/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
@@ -26,42 +26,9 @@ let c = <ruhroh />;
 
 //// [jsxElementTypeLiteralWithGeneric.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 // should be fine - `ElementType` accepts `div`
 var a = React.createElement("div", null);
 // Should be an error.
diff --git a/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js b/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
index fbbcb46c2d709..33f70704845a0 100644
--- a/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
+++ b/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
@@ -21,42 +21,9 @@ const element = (
 
 //// [jsxEmptyExpressionNotCountedAsChild.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 function Wrapper(props) {
     return React.createElement("div", null, props.children);
 }
diff --git a/tests/baselines/reference/jsxExcessPropsAndAssignability.js b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
index eec661691ba3b..43ad94e3f134e 100644
--- a/tests/baselines/reference/jsxExcessPropsAndAssignability.js
+++ b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
@@ -32,41 +32,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var myHoc = function (ComposedComponent) {
     var WrapperComponent = null;
     var props = null;
diff --git a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt
index 453fbd038e286..11dd272e65c7f 100644
--- a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt
+++ b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt
@@ -1,4 +1,4 @@
-jsxFragmentFactoryReference.tsx(3,9): error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed.
+jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== jsxFragmentFactoryReference.tsx (1 errors) ====
@@ -6,7 +6,7 @@ jsxFragmentFactoryReference.tsx(3,9): error TS2875: This JSX tag requires the mo
         content = () => (
             <></>
             ~~
-!!! error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed.
+!!! error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
         )
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt
index 7529f71c4d566..b9185baa77ec7 100644
--- a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt
+++ b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt
@@ -1,4 +1,4 @@
-jsxFragmentFactoryReference.tsx(3,9): error TS2875: This JSX tag requires the module path 'react/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed.
+jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== jsxFragmentFactoryReference.tsx (1 errors) ====
@@ -6,7 +6,7 @@ jsxFragmentFactoryReference.tsx(3,9): error TS2875: This JSX tag requires the mo
         content = () => (
             <></>
             ~~
-!!! error TS2875: This JSX tag requires the module path 'react/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed.
+!!! error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
         )
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxHasLiteralType.js b/tests/baselines/reference/jsxHasLiteralType.js
index 5064fa100c36e..209e4cbf426cf 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -27,41 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var MyComponent = /** @class */ (function (_super) {
     __extends(MyComponent, _super);
     function MyComponent() {
diff --git a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
index 7a3cb23a80a42..1f73962788b3f 100644
--- a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
+++ b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
@@ -11,41 +11,8 @@ const tag = <div></div>;
 
 //// [jsxImportForSideEffectsNonExtantNoError.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 require("./App.css"); // doesn't actually exist
 var tag = React.createElement("div", null);
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index ec40b2237c076..f41787501976d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -15,11 +15,8 @@ let x = Test; // emit test_1.default
 
 //// [consumer.jsx]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="component.d.ts" />
-var Test_1 = __importDefault(require("Test"));
+var Test_1 = require("Test");
 var x = Test_1.default; // emit test_1.default
 <anything attr={Test_1.default}/>; // ?
diff --git a/tests/baselines/reference/jsxIntrinsicElementsCompatability.js b/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
index 42d7bba5817a6..7166520ddd3be 100644
--- a/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
+++ b/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
@@ -14,42 +14,9 @@ function Test<T extends 'button' | 'a'>(el: T) {
 
 //// [jsxIntrinsicElementsCompatability.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 function SomeComponent(props) {
     // Just so the return value is RectElement, the rendered element doesnt matter
     return React.createElement("div", null);
diff --git a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
index d9aa42c0d725e..cef46635ab9cc 100644
--- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
+++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
@@ -33,42 +33,9 @@ const l = <div<number>/>; // existing type argument with no internal issues
 
 //// [jsxIntrinsicElementsTypeArgumentErrors.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 // opening + closing
 var a = React.createElement("div", null); // empty type args
 var b = React.createElement("div", null); // trailing comma type args
diff --git a/tests/baselines/reference/jsxIntrinsicUnions.js b/tests/baselines/reference/jsxIntrinsicUnions.js
index 4c25bbb44902e..dbc0fd8eabd90 100644
--- a/tests/baselines/reference/jsxIntrinsicUnions.js
+++ b/tests/baselines/reference/jsxIntrinsicUnions.js
@@ -13,40 +13,7 @@ const tag = <El className="ok" key="key">{"Title"}</El>;
 //// [jsxIntrinsicUnions.js]
 "use strict";
 /// <reference path="react16.d.ts" />
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var El = Math.random() ? 'h1' : 'h2';
 var tag = React.createElement(El, { className: "ok", key: "key" }, "Title");
diff --git a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
index 195ca5b5746f4..3e6d237dbc414 100644
--- a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
+++ b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
@@ -29,41 +29,8 @@ const d = <MyTagWithOptionalNonJSXBits x={2} />; // Technically OK, but probably
 //// [jsxIssuesErrorWhenTagExpectsTooManyArguments.js]
 "use strict";
 /// <reference path="react16.d.ts" />
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 function MyComp4(props, context, bad, verybad) {
     return React.createElement("div", null);
 }
diff --git a/tests/baselines/reference/jsxNamespaceReexports.js b/tests/baselines/reference/jsxNamespaceReexports.js
index 1b3046e78b3ff..157c5ce7eb105 100644
--- a/tests/baselines/reference/jsxNamespaceReexports.js
+++ b/tests/baselines/reference/jsxNamespaceReexports.js
@@ -27,39 +27,6 @@ function createElement(element, props) {
 }
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var MyLib = __importStar(require("./library"));
+var MyLib = require("./library");
 var content = MyLib.createElement("my-element", null);
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
index b91b48357abdd..6310cf21524b4 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
@@ -36,44 +36,11 @@ export * as four from "./four.js";
 
 //// [one.jsx]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return <h1>Hello world</h1>; };
 exports.HelloWorld = HelloWorld;
 exports.frag = <><div></div></>;
@@ -101,87 +68,21 @@ exports.frag = <><div></div></>;
 exports.selfClosing = <img src="./image.png"/>;
 //// [four.jsx]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return <h1>Hello world</h1>; };
 exports.HelloWorld = HelloWorld;
 exports.frag = <><div></div></>;
 exports.selfClosing = <img src="./image.png"/>;
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.four = exports.three = exports.two = exports.one = void 0;
-exports.one = __importStar(require("./one.js"));
-exports.two = __importStar(require("./two.js"));
-exports.three = __importStar(require("./three.js"));
-exports.four = __importStar(require("./four.js"));
+exports.one = require("./one.js");
+exports.two = require("./two.js");
+exports.three = require("./three.js");
+exports.four = require("./four.js");
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
index ca060d3ae8507..82c052f0224f9 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
@@ -36,44 +36,11 @@ export * as four from "./four.js";
 
 //// [one.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -104,45 +71,12 @@ exports.frag = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, js
 exports.selfClosing = (0, jsx_runtime_1.jsx)("img", { src: "./image.png" });
 //// [four.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -150,42 +84,9 @@ exports.frag = React.createElement(React.Fragment, null,
 exports.selfClosing = React.createElement("img", { src: "./image.png" });
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.four = exports.three = exports.two = exports.one = void 0;
-exports.one = __importStar(require("./one.js"));
-exports.two = __importStar(require("./two.js"));
-exports.three = __importStar(require("./three.js"));
-exports.four = __importStar(require("./four.js"));
+exports.one = require("./one.js");
+exports.two = require("./two.js");
+exports.three = require("./three.js");
+exports.four = require("./four.js");
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
index ca060d3ae8507..82c052f0224f9 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
@@ -36,44 +36,11 @@ export * as four from "./four.js";
 
 //// [one.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -104,45 +71,12 @@ exports.frag = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, js
 exports.selfClosing = (0, jsx_runtime_1.jsx)("img", { src: "./image.png" });
 //// [four.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -150,42 +84,9 @@ exports.frag = React.createElement(React.Fragment, null,
 exports.selfClosing = React.createElement("img", { src: "./image.png" });
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.four = exports.three = exports.two = exports.one = void 0;
-exports.one = __importStar(require("./one.js"));
-exports.two = __importStar(require("./two.js"));
-exports.three = __importStar(require("./three.js"));
-exports.four = __importStar(require("./four.js"));
+exports.one = require("./one.js");
+exports.two = require("./two.js");
+exports.three = require("./three.js");
+exports.four = require("./four.js");
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
index 71f270ca594a6..f58c54d25f1bd 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
@@ -36,44 +36,11 @@ export * as four from "./four.js";
 
 //// [one.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -108,45 +75,12 @@ exports.frag = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { child
 exports.selfClosing = (0, jsx_dev_runtime_1.jsxDEV)("img", { src: "./image.png" }, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 27 }, this);
 //// [four.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selfClosing = exports.frag = exports.HelloWorld = void 0;
 /// <reference path="react16.d.ts" />
 /* @jsxRuntime automatic */
 /* @jsxRuntime classic */
-var React = __importStar(require("react"));
+var React = require("react");
 var HelloWorld = function () { return React.createElement("h1", null, "Hello world"); };
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -154,42 +88,9 @@ exports.frag = React.createElement(React.Fragment, null,
 exports.selfClosing = React.createElement("img", { src: "./image.png" });
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.four = exports.three = exports.two = exports.one = void 0;
-exports.one = __importStar(require("./one.js"));
-exports.two = __importStar(require("./two.js"));
-exports.three = __importStar(require("./three.js"));
-exports.four = __importStar(require("./four.js"));
+exports.one = require("./one.js");
+exports.two = require("./two.js");
+exports.three = require("./three.js");
+exports.four = require("./four.js");
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
index bd05bb83527d5..abd4b83948abc 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
@@ -31,11 +31,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+var react_1 = require("react");
 var Info = function (props) {
     return props.status === "hidden"
         ? react_1.default.createElement("noscript", null)
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 7d85cf5e24f18..e14f96301a91f 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -39,12 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="component.d.ts" />
-var BaseComponent_1 = __importDefault(require("BaseComponent"));
+var BaseComponent_1 = require("BaseComponent");
 var TestComponent = /** @class */ (function (_super) {
     __extends(TestComponent, _super);
     function TestComponent() {
diff --git a/tests/baselines/reference/keepImportsInDts1.errors.txt b/tests/baselines/reference/keepImportsInDts1.errors.txt
deleted file mode 100644
index f97a0bc46f547..0000000000000
--- a/tests/baselines/reference/keepImportsInDts1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== c:/test.d.ts (0 errors) ====
-    export {}; 
-==== c:/app/main.ts (0 errors) ====
-    import "test"
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts2.errors.txt b/tests/baselines/reference/keepImportsInDts2.errors.txt
deleted file mode 100644
index 5d2e2145509e0..0000000000000
--- a/tests/baselines/reference/keepImportsInDts2.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== folder/test.ts (0 errors) ====
-    export {};
-==== main.ts (0 errors) ====
-    import "./folder/test"
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts3.errors.txt b/tests/baselines/reference/keepImportsInDts3.errors.txt
deleted file mode 100644
index ab575337fb28a..0000000000000
--- a/tests/baselines/reference/keepImportsInDts3.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== c:/test.ts (0 errors) ====
-    export {};
-==== c:/app/main.ts (0 errors) ====
-    import "test"
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts4.errors.txt b/tests/baselines/reference/keepImportsInDts4.errors.txt
deleted file mode 100644
index 1fc5e4d5f136a..0000000000000
--- a/tests/baselines/reference/keepImportsInDts4.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== folder/test.ts (0 errors) ====
-    export {};
-==== main.ts (0 errors) ====
-    import "./folder/test"
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js b/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js
index 0ff6fc8623243..17e01e6a40fca 100644
--- a/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js
+++ b/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js
@@ -22,39 +22,6 @@ function add(a, b) {
 }
 //// [test.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var example = __importStar(require("./example"));
+var example = require("./example");
 test(example, "default");
diff --git a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
index 3f04b2a944f07..c82821c21e508 100644
--- a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
+++ b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 labeledStatementExportDeclarationNoCrash1.ts(3,14): error TS1155: 'const' declarations must be initialized.
 labeledStatementExportDeclarationNoCrash1.ts(5,1): error TS1184: Modifiers cannot appear here.
 labeledStatementExportDeclarationNoCrash1.ts(5,14): error TS1155: 'const' declarations must be initialized.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== labeledStatementExportDeclarationNoCrash1.ts (3 errors) ====
     // https://github.com/microsoft/TypeScript/issues/59372
     
diff --git a/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js b/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js
index a270b944f2a56..d9f4564535887 100644
--- a/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js
+++ b/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js
@@ -33,39 +33,6 @@ export interface Thing {} // not exported in export map, inaccessible under new
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -106,7 +73,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 var a = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     switch (_a.label) {
-        case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("inner")); })];
+        case 0: return [4 /*yield*/, Promise.resolve().then(function () { return require("inner"); })];
         case 1: return [2 /*return*/, (_a.sent()).x()];
     }
 }); }); };
diff --git a/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt b/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
deleted file mode 100644
index 35581620421d6..0000000000000
--- a/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    /// <reference lib="dom" preserve="true" />
-    export declare const elem: HTMLElement;
-    
-==== file2.ts (0 errors) ====
-    /// <reference lib="dom" preserve="true" />
-    export {}
-    declare const elem: HTMLElement;
\ No newline at end of file
diff --git a/tests/baselines/reference/libReferenceNoLibBundle.errors.txt b/tests/baselines/reference/libReferenceNoLibBundle.errors.txt
deleted file mode 100644
index 2f82acb2c125b..0000000000000
--- a/tests/baselines/reference/libReferenceNoLibBundle.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== fakelib.ts (0 errors) ====
-    interface Object { }
-    interface Array<T> { }
-    interface String { }
-    interface Boolean { }
-    interface Number { }
-    interface Function { }
-    interface RegExp { }
-    interface IArguments { }
-    
-    
-==== file1.ts (0 errors) ====
-    /// <reference lib="dom" />
-    export declare interface HTMLElement { field: string; }
-    export const elem: HTMLElement = { field: 'a' };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.errors.txt b/tests/baselines/reference/memberAccessMustUseModuleInstances.errors.txt
deleted file mode 100644
index ab36e8b411a4a..0000000000000
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== memberAccessMustUseModuleInstances_1.ts (0 errors) ====
-    ///<reference path='memberAccessMustUseModuleInstances_0.ts'/>
-    import WinJS = require('memberAccessMustUseModuleInstances_0');
-    
-    WinJS.Promise.timeout(10);
-    
-==== memberAccessMustUseModuleInstances_0.ts (0 errors) ====
-    export class Promise {
-        static timeout(delay: number): Promise {
-            return null;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedDeclarations6.errors.txt b/tests/baselines/reference/mergedDeclarations6.errors.txt
deleted file mode 100644
index cea7df9f75504..0000000000000
--- a/tests/baselines/reference/mergedDeclarations6.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A {
-        protected protected: any;
-    
-        protected setProtected(val: any) {
-            this.protected = val;
-        }
-    }
-    
-==== b.ts (0 errors) ====
-    import {A} from './a';
-    
-    declare module "./a" {
-        interface A { }
-    }
-    
-    export class B extends A {
-        protected setProtected() {
-    
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedDeclarations6.types b/tests/baselines/reference/mergedDeclarations6.types
index 5962489ce7a2c..9cc38a99f3dad 100644
--- a/tests/baselines/reference/mergedDeclarations6.types
+++ b/tests/baselines/reference/mergedDeclarations6.types
@@ -7,25 +7,20 @@ export class A {
 
     protected protected: any;
 >protected : any
->          : ^^^
 
     protected setProtected(val: any) {
 >setProtected : (val: any) => void
 >             : ^   ^^   ^^^^^^^^^
 >val : any
->    : ^^^
 
         this.protected = val;
 >this.protected = val : any
->                     : ^^^
 >this.protected : any
->               : ^^^
 >this : this
 >     : ^^^^
 >protected : any
 >          : ^^^
 >val : any
->    : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index 2880c6f82878b..340f03189bbaa 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -24,39 +24,6 @@ let p: Passport = passport.use();
 
 //// [test.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var passport = __importStar(require("passport"));
+var passport = require("passport");
 var p = passport.use();
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt b/tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt
deleted file mode 100644
index df4a18a2ed0ee..0000000000000
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== moduleAliasAsFunctionArgument_1.ts (0 errors) ====
-    ///<reference path='moduleAliasAsFunctionArgument_0.ts'/>
-    import a = require('moduleAliasAsFunctionArgument_0');
-    
-    function fn(arg: { x: number }) {
-    }
-    
-    a.x; // OK
-    fn(a); // Error: property 'x' is missing from 'a'
-    
-==== moduleAliasAsFunctionArgument_0.ts (0 errors) ====
-    export var x: number;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt
deleted file mode 100644
index ab7230781a1f1..0000000000000
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== map1.ts (0 errors) ====
-    import { Observable } from "./observable"
-    
-    (<any>Observable.prototype).map = function() { }
-    
-    declare module "./observable" {
-        interface I {x0}
-    }
-    
-==== map2.ts (0 errors) ====
-    import { Observable } from "./observable"
-    
-    (<any>Observable.prototype).map = function() { }
-    
-    declare module "./observable" {
-        interface I {x1}
-    }
-    
-    
-==== observable.ts (0 errors) ====
-    export declare class Observable<T> {
-        filter(pred: (e:T) => boolean): Observable<T>;
-    }
-    
-==== main.ts (0 errors) ====
-    import { Observable } from "./observable"
-    import "./map1";
-    import "./map2";
-    
-    let x: Observable<number>;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
index 5cf30422617b6..ad9049c840c54 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
@@ -9,11 +9,9 @@ import { Observable } from "./observable"
 >(<any>Observable.prototype).map = function() { } : () => void
 >                                                 : ^^^^^^^^^^
 >(<any>Observable.prototype).map : any
->                                : ^^^
 >(<any>Observable.prototype) : any
 >                            : ^^^
 ><any>Observable.prototype : any
->                          : ^^^
 >Observable.prototype : Observable<any>
 >                     : ^^^^^^^^^^^^^^^
 >Observable : typeof Observable
@@ -31,7 +29,6 @@ declare module "./observable" {
 
     interface I {x0}
 >x0 : any
->   : ^^^
 }
 
 === map2.ts ===
@@ -43,11 +40,9 @@ import { Observable } from "./observable"
 >(<any>Observable.prototype).map = function() { } : () => void
 >                                                 : ^^^^^^^^^^
 >(<any>Observable.prototype).map : any
->                                : ^^^
 >(<any>Observable.prototype) : any
 >                            : ^^^
 ><any>Observable.prototype : any
->                          : ^^^
 >Observable.prototype : Observable<any>
 >                     : ^^^^^^^^^^^^^^^
 >Observable : typeof Observable
@@ -65,7 +60,6 @@ declare module "./observable" {
 
     interface I {x1}
 >x1 : any
->   : ^^^
 }
 
 
diff --git a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js
index 1eff3d719befb..03159173541fe 100644
--- a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js
+++ b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js
@@ -50,40 +50,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./file"), exports);
 //// [augment.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ns = __importStar(require("./reexport"));
+var ns = require("./reexport");
 var g = ns.Root.A;
 f.x;
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8.js b/tests/baselines/reference/moduleAugmentationGlobal8.js
index 6b4db1bd3fdbf..2b15cca3f095a 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8.js
@@ -10,4 +10,7 @@ export {}
 
 
 //// [moduleAugmentationGlobal8.js]
-export {};
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8_1.js b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
index 66a7d16991c4d..c4de5018bf775 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8_1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
@@ -10,4 +10,7 @@ export {}
 
 
 //// [moduleAugmentationGlobal8_1.js]
-export {};
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt b/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
deleted file mode 100644
index a45ae85babde3..0000000000000
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export class Cls {
-    }
-    
-==== m2.ts (0 errors) ====
-    import {Cls} from "./m1";
-    (<any>Cls.prototype).foo = function() { return 1; };
-    (<any>Cls.prototype).bar = function() { return "1"; };
-    
-    declare module "./m1" {
-        interface Cls {
-            foo(): number;
-        }
-    }
-    
-    declare module "./m1" {
-        interface Cls {
-            bar(): string;
-        }
-    }
-    
-==== m3.ts (0 errors) ====
-    export class C1 { x: number }
-    export class C2 { x: string }
-    
-==== m4.ts (0 errors) ====
-    import {Cls} from "./m1";
-    import {C1, C2} from "./m3";
-    (<any>Cls.prototype).baz1 = function() { return undefined };
-    (<any>Cls.prototype).baz2 = function() { return undefined };
-    
-    declare module "./m1" {
-        interface Cls {
-            baz1(): C1;
-        }
-    }
-    
-    declare module "./m1" {
-        interface Cls {
-            baz2(): C2;
-        }
-    }
-    
-==== test.ts (0 errors) ====
-    import { Cls } from "./m1";
-    import "m2";
-    import "m4";
-    let c: Cls;
-    c.foo().toExponential();
-    c.bar().toLowerCase();
-    c.baz1().x.toExponential();
-    c.baz2().x.toLowerCase();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
index 665aff9a89ab8..5af7b27038a40 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
@@ -15,11 +15,9 @@ import {Cls} from "./m1";
 >(<any>Cls.prototype).foo = function() { return 1; } : () => number
 >                                                    : ^^^^^^^^^^^^
 >(<any>Cls.prototype).foo : any
->                         : ^^^
 >(<any>Cls.prototype) : any
 >                     : ^^^
 ><any>Cls.prototype : any
->                   : ^^^
 >Cls.prototype : Cls
 >              : ^^^
 >Cls : typeof Cls
@@ -37,11 +35,9 @@ import {Cls} from "./m1";
 >(<any>Cls.prototype).bar = function() { return "1"; } : () => string
 >                                                      : ^^^^^^^^^^^^
 >(<any>Cls.prototype).bar : any
->                         : ^^^
 >(<any>Cls.prototype) : any
 >                     : ^^^
 ><any>Cls.prototype : any
->                   : ^^^
 >Cls.prototype : Cls
 >              : ^^^
 >Cls : typeof Cls
@@ -105,11 +101,9 @@ import {C1, C2} from "./m3";
 >(<any>Cls.prototype).baz1 = function() { return undefined } : () => any
 >                                                            : ^^^^^^^^^
 >(<any>Cls.prototype).baz1 : any
->                          : ^^^
 >(<any>Cls.prototype) : any
 >                     : ^^^
 ><any>Cls.prototype : any
->                   : ^^^
 >Cls.prototype : Cls
 >              : ^^^
 >Cls : typeof Cls
@@ -127,11 +121,9 @@ import {C1, C2} from "./m3";
 >(<any>Cls.prototype).baz2 = function() { return undefined } : () => any
 >                                                            : ^^^^^^^^^
 >(<any>Cls.prototype).baz2 : any
->                          : ^^^
 >(<any>Cls.prototype) : any
 >                     : ^^^
 ><any>Cls.prototype : any
->                   : ^^^
 >Cls.prototype : Cls
 >              : ^^^
 >Cls : typeof Cls
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.errors.txt b/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
deleted file mode 100644
index eddd60c92f3de..0000000000000
--- a/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    
-    import {A} from "./a";
-    import {B} from "./b";
-    import {Cls} from "C";
-    
-    A.prototype.getB = function () { return undefined; }
-    A.prototype.getCls = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getB(): B;
-        }
-    }
-    
-    declare module "./a" {
-        interface A {
-            getCls(): Cls;
-        }
-    }
-    
-==== main.ts (0 errors) ====
-    import {A} from "./a";
-    import "d";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.errors.txt b/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
deleted file mode 100644
index 230be8a692bf6..0000000000000
--- a/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    
-    import {A} from "./a";
-    import {B} from "./b";
-    
-    A.prototype.getB = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getB(): B;
-        }
-    }
-    
-==== e.ts (0 errors) ====
-    import {A} from "./a";
-    import {Cls} from "C";
-    
-    A.prototype.getCls = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getCls(): Cls;
-        }
-    }
-    
-==== main.ts (0 errors) ====
-    import {A} from "./a";
-    import "d";
-    import "e";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.errors.txt b/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
deleted file mode 100644
index bdce32fc03a65..0000000000000
--- a/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== main.ts (0 errors) ====
-    /// <reference path="d.d.ts"/>
-    import {A} from "./a";
-    import "D";
-    import "e";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
-    
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.d.ts (0 errors) ====
-    declare module "D" {
-        import {A} from "a";
-        import {B} from "b";
-        module "a" {
-            interface A {
-                getB(): B;
-            }
-        }
-    }
-    
-==== e.ts (0 errors) ====
-    /// <reference path="c.d.ts" preserve="true"/>
-    import {A} from "./a";
-    import {Cls} from "C";
-    
-    A.prototype.getCls = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getCls(): Cls;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 14ae0f65f2ffa..dfb7176ee8d84 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -106,3 +106,53 @@ declare module "main" {
     import "D";
     import "e";
 }
+
+
+//// [DtsFileErrors]
+
+
+f.d.ts(20,12): error TS2882: Cannot find module or type declarations for side-effect import of 'D'.
+
+
+==== f.d.ts (1 errors) ====
+    /// <reference path="c.d.ts" preserve="true" />
+    declare module "a" {
+        export class A {
+        }
+    }
+    declare module "b" {
+        export class B {
+            x: number;
+        }
+    }
+    declare module "e" {
+        import { Cls } from "C";
+        module "a" {
+            interface A {
+                getCls(): Cls;
+            }
+        }
+    }
+    declare module "main" {
+        import "D";
+               ~~~
+!!! error TS2882: Cannot find module or type declarations for side-effect import of 'D'.
+        import "e";
+    }
+    
+==== c.d.ts (0 errors) ====
+    declare module "C" {
+        class Cls {y: string; }
+    }
+    
+==== d.d.ts (0 errors) ====
+    declare module "D" {
+        import {A} from "a";
+        import {B} from "b";
+        module "a" {
+            interface A {
+                getB(): B;
+            }
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.errors.txt b/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
deleted file mode 100644
index f2647f4fc4f1c..0000000000000
--- a/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== main.ts (0 errors) ====
-    /// <reference path="d.d.ts"/>
-    /// <reference path="e.d.ts"/>
-    import {A} from "./a";
-    import "D";
-    import "E";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
-    
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.d.ts (0 errors) ====
-    declare module "D" {
-        import {A} from "a";
-        import {B} from "b";
-        module "a" {
-            interface A {
-                getB(): B;
-            }
-        }
-    }
-    
-==== e.d.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    declare module "E" {
-        import {A} from "a";
-        import {Cls} from "C";
-    
-        module "a" {
-            interface A {
-                getCls(): Cls;
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index d009f154ad0fd..f70b3e3768262 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -93,3 +93,60 @@ declare module "main" {
     import "D";
     import "E";
 }
+
+
+//// [DtsFileErrors]
+
+
+f.d.ts(11,12): error TS2882: Cannot find module or type declarations for side-effect import of 'D'.
+f.d.ts(12,12): error TS2882: Cannot find module or type declarations for side-effect import of 'E'.
+
+
+==== f.d.ts (2 errors) ====
+    declare module "a" {
+        export class A {
+        }
+    }
+    declare module "b" {
+        export class B {
+            x: number;
+        }
+    }
+    declare module "main" {
+        import "D";
+               ~~~
+!!! error TS2882: Cannot find module or type declarations for side-effect import of 'D'.
+        import "E";
+               ~~~
+!!! error TS2882: Cannot find module or type declarations for side-effect import of 'E'.
+    }
+    
+==== c.d.ts (0 errors) ====
+    declare module "C" {
+        class Cls {y: string; }
+    }
+    
+==== d.d.ts (0 errors) ====
+    declare module "D" {
+        import {A} from "a";
+        import {B} from "b";
+        module "a" {
+            interface A {
+                getB(): B;
+            }
+        }
+    }
+    
+==== e.d.ts (0 errors) ====
+    /// <reference path="c.d.ts"/>
+    declare module "E" {
+        import {A} from "a";
+        import {Cls} from "C";
+    
+        module "a" {
+            interface A {
+                getCls(): Cls;
+            }
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleExportAliasImported.types b/tests/baselines/reference/moduleExportAliasImported.types
index 3ee5aee0b1769..d6a765c755544 100644
--- a/tests/baselines/reference/moduleExportAliasImported.types
+++ b/tests/baselines/reference/moduleExportAliasImported.types
@@ -31,8 +31,8 @@ module.exports = alias
 
 === importer.js ===
 import('./bug28014')
->import('./bug28014') : Promise<{ default: { (): void; version: 1; }; version: 1; }>
->                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>import('./bug28014') : Promise<{ (): void; version: 1; }>
+>                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >'./bug28014' : "./bug28014"
 >             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index ee43b3555b24a..d4854f5eb330b 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -16,26 +16,28 @@ void 0;
 if (!module.exports) module.exports = "";
 
 //// [moduleExports1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScript = void 0;
-var TypeScript;
-(function (TypeScript) {
-    var Strasse;
-    (function (Strasse) {
-        var Street;
-        (function (Street) {
-            var Rue = /** @class */ (function () {
-                function Rue() {
-                }
-                return Rue;
-            }());
-            Street.Rue = Rue;
-        })(Street = Strasse.Street || (Strasse.Street = {}));
-    })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {}));
-})(TypeScript || (exports.TypeScript = TypeScript = {}));
-var rue = new TypeScript.Strasse.Street.Rue();
-rue.address = "1 Main Street";
-void 0;
-if (!module.exports)
-    module.exports = "";
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.TypeScript = void 0;
+    var TypeScript;
+    (function (TypeScript) {
+        var Strasse;
+        (function (Strasse) {
+            var Street;
+            (function (Street) {
+                var Rue = /** @class */ (function () {
+                    function Rue() {
+                    }
+                    return Rue;
+                }());
+                Street.Rue = Rue;
+            })(Street = Strasse.Street || (Strasse.Street = {}));
+        })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {}));
+    })(TypeScript || (exports.TypeScript = TypeScript = {}));
+    var rue = new TypeScript.Strasse.Street.Rue();
+    rue.address = "1 Main Street";
+    void 0;
+    if (!module.exports)
+        module.exports = "";
+});
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt
deleted file mode 100644
index 582decfe9ccc2..0000000000000
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== moduleImportedForTypeArgumentPosition_1.ts (0 errors) ====
-    /**This is on import declaration*/
-    import M2 = require("moduleImportedForTypeArgumentPosition_0");
-    class C1<T>{ }
-    class Test1 extends C1<M2.M2C> {
-    }
-    
-==== moduleImportedForTypeArgumentPosition_0.ts (0 errors) ====
-    export interface M2C { }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleMergeConstructor.errors.txt b/tests/baselines/reference/moduleMergeConstructor.errors.txt
deleted file mode 100644
index eb50eb679b69b..0000000000000
--- a/tests/baselines/reference/moduleMergeConstructor.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.d.ts (0 errors) ====
-    declare module "foo" {
-        export class Foo {
-            constructor();
-            method1(): any;
-        }
-    }
-    
-==== foo-ext.d.ts (0 errors) ====
-    declare module "foo" {
-        export interface Foo {
-            method2(): any;
-        }
-    }
-    
-==== index.ts (0 errors) ====
-    import * as foo from "foo";
-    
-    class Test {
-        bar: foo.Foo;
-        constructor() {
-            this.bar = new foo.Foo();
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index 3adba1e2b4fbd..954be8981d24b 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -27,43 +27,9 @@ class Test {
 
 
 //// [index.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "foo"], function (require, exports, foo) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    foo = __importStar(foo);
     var Test = /** @class */ (function () {
         function Test() {
             this.bar = new foo.Foo();
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
deleted file mode 100644
index 506f5a57da502..0000000000000
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /a.ts (0 errors) ====
-    const foo = import("./b");
-    
-==== /b.js (0 errors) ====
-    export default 1;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js
index 44c04563b1c64..e112ffae2889c 100644
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js
@@ -8,37 +8,4 @@ export default 1;
 
 
 //// [a.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-const foo = Promise.resolve().then(() => __importStar(require("b")));
+const foo = Promise.resolve().then(() => require("b"));
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
deleted file mode 100644
index 506f5a57da502..0000000000000
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /a.ts (0 errors) ====
-    const foo = import("./b");
-    
-==== /b.js (0 errors) ====
-    export default 1;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleNoneErrors.errors.txt b/tests/baselines/reference/moduleNoneErrors.errors.txt
index 7ff5b8706838c..1c79566fe7150 100644
--- a/tests/baselines/reference/moduleNoneErrors.errors.txt
+++ b/tests/baselines/reference/moduleNoneErrors.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(1,14): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     export class Foo {
                  ~~~
diff --git a/tests/baselines/reference/moduleNoneOutFile.errors.txt b/tests/baselines/reference/moduleNoneOutFile.errors.txt
deleted file mode 100644
index 12037428e5f2a..0000000000000
--- a/tests/baselines/reference/moduleNoneOutFile.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== first.ts (0 errors) ====
-    class Foo {}
-==== second.ts (0 errors) ====
-    class Bar extends Foo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/modulePrologueAMD.errors.txt b/tests/baselines/reference/modulePrologueAMD.errors.txt
deleted file mode 100644
index ed9351bbd350f..0000000000000
--- a/tests/baselines/reference/modulePrologueAMD.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== modulePrologueAMD.ts (0 errors) ====
-    "use strict";
-    
-    export class Foo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/modulePrologueSystem.errors.txt b/tests/baselines/reference/modulePrologueSystem.errors.txt
deleted file mode 100644
index 4c128553e2f44..0000000000000
--- a/tests/baselines/reference/modulePrologueSystem.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== modulePrologueSystem.ts (0 errors) ====
-    "use strict";
-    
-    export class Foo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/modulePrologueUmd.errors.txt b/tests/baselines/reference/modulePrologueUmd.errors.txt
deleted file mode 100644
index 70ed6ce2dd894..0000000000000
--- a/tests/baselines/reference/modulePrologueUmd.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== modulePrologueUmd.ts (0 errors) ====
-    "use strict";
-    
-    export class Foo {}
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolution/same-file-is-referenced-using-absolute-and-relative-names.js b/tests/baselines/reference/moduleResolution/same-file-is-referenced-using-absolute-and-relative-names.js
index 7800c822f4a29..61a7354cee492 100644
--- a/tests/baselines/reference/moduleResolution/same-file-is-referenced-using-absolute-and-relative-names.js
+++ b/tests/baselines/reference/moduleResolution/same-file-is-referenced-using-absolute-and-relative-names.js
@@ -5,5 +5,4 @@
 var x
 
 Diagnostics::
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
diff --git a/tests/baselines/reference/moduleResolution/two-files-exist-on-disk-that-differs-only-in-casing.js b/tests/baselines/reference/moduleResolution/two-files-exist-on-disk-that-differs-only-in-casing.js
index f604a4236ec6d..6966f7bd7ddc7 100644
--- a/tests/baselines/reference/moduleResolution/two-files-exist-on-disk-that-differs-only-in-casing.js
+++ b/tests/baselines/reference/moduleResolution/two-files-exist-on-disk-that-differs-only-in-casing.js
@@ -8,7 +8,6 @@ export var x
 export var y
 
 Diagnostics::
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c.ts(1,17): error TS1261: Already included file name '/a/b/D.ts' differs from file name 'd.ts' only in casing.
   The file is in the program because:
     Imported via "D" from file 'c.ts'
diff --git a/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(imports).js b/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(imports).js
index f48832a77572b..61962b8246048 100644
--- a/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(imports).js
+++ b/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(imports).js
@@ -5,7 +5,6 @@ import {x} from "D"
 export var x
 
 Diagnostics::
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c.ts(1,17): error TS1261: Already included file name '/a/b/D.ts' differs from file name 'd.ts' only in casing.
   The file is in the program because:
     Imported via "D" from file 'c.ts'
diff --git a/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(tripleslash-references).js b/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(tripleslash-references).js
index 9983eaff2b6ce..8ad1ff74f131c 100644
--- a/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(tripleslash-references).js
+++ b/tests/baselines/reference/moduleResolution/two-files-used-in-program-differ-only-in-casing-(tripleslash-references).js
@@ -5,7 +5,6 @@
 var x
 
 Diagnostics::
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c.ts(1,22): error TS1261: Already included file name 'D.ts' differs from file name 'd.ts' only in casing.
   The file is in the program because:
     Referenced via 'D.ts' from file 'c.ts'
diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js
index 26acc87112bcc..e992b995bc517 100644
--- a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js
+++ b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js
@@ -14,39 +14,6 @@ p.thing();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var p = __importStar(require("pkg"));
+var p = require("pkg");
 p.thing();
diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js
index 26acc87112bcc..e992b995bc517 100644
--- a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js
+++ b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js
@@ -14,39 +14,6 @@ p.thing();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var p = __importStar(require("pkg"));
+var p = require("pkg");
 p.thing();
diff --git a/tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt b/tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt
deleted file mode 100644
index 15dcc5fb668cf..0000000000000
--- a/tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /dir1/dir2/dir3/a.js (0 errors) ====
-    export default "dir1/dir2/dir3/a.js";
-    
-==== /dir1/dir2/a.ts (0 errors) ====
-    export default "dir1/dir2/a.ts";
-    
-==== /dir1/dir2/dir3/index.ts (0 errors) ====
-    import a from "a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/multiline.js b/tests/baselines/reference/multiline.js
index d829ebd85287f..8d052566f5479 100644
--- a/tests/baselines/reference/multiline.js
+++ b/tests/baselines/reference/multiline.js
@@ -69,42 +69,9 @@ exports.texts.push(100);
 exports.texts.push("100");
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = MyComponent;
-var React = __importStar(require("react"));
+var React = require("react");
 function MyComponent(props) {
     return React.createElement("div", null);
 }
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index f0339a3eb9cfe..ec72a9ed668ad 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -33,9 +33,6 @@ var x = 10;
 exports.default = x;
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 (0, m1_1.default)();
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 063bbaeedeb22..fbf2a88633f22 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -25,9 +25,6 @@ function bar() {
 }
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 (0, m1_1.default)();
diff --git a/tests/baselines/reference/namespaceMemberAccess.js b/tests/baselines/reference/namespaceMemberAccess.js
index 08485cc9784e1..4de0614d3ba9d 100644
--- a/tests/baselines/reference/namespaceMemberAccess.js
+++ b/tests/baselines/reference/namespaceMemberAccess.js
@@ -19,40 +19,7 @@ var A = /** @class */ (function () {
 }());
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var types = __importStar(require("./a"));
+var types = require("./a");
 types.A;
 var A = types.A;
diff --git a/tests/baselines/reference/narrowedImports.js b/tests/baselines/reference/narrowedImports.js
index 628bdab5cb62b..08de60a0d6112 100644
--- a/tests/baselines/reference/narrowedImports.js
+++ b/tests/baselines/reference/narrowedImports.js
@@ -26,42 +26,9 @@ if (b1) x = b1;
 
 //// [x.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importStar(require("./a"));
-var b0 = __importStar(require("./b"));
+var a_1 = require("./a");
+var b0 = require("./b");
 var b1 = require("./b");
 var x;
 if (a_1.default)
diff --git a/tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt b/tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt
deleted file mode 100644
index d77ca1b616b35..0000000000000
--- a/tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== nestedRedeclarationInES6AMD.ts (0 errors) ====
-    function a() {
-        {
-            let status = 1;
-            status = 2;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/newAbstractInstance2.js b/tests/baselines/reference/newAbstractInstance2.js
index 239d98d7c0ddf..249cc587901c1 100644
--- a/tests/baselines/reference/newAbstractInstance2.js
+++ b/tests/baselines/reference/newAbstractInstance2.js
@@ -19,9 +19,6 @@ var default_1 = /** @class */ (function () {
 exports.default = default_1;
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 new a_1.default();
diff --git a/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt b/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
index d6f3865e2b2ee..7af8f8770a0f1 100644
--- a/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
+++ b/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
@@ -1,11 +1,9 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /a.ts (0 errors) ====
     import { C } from "projB";
     
diff --git a/tests/baselines/reference/noCrashOnImportShadowing.js b/tests/baselines/reference/noCrashOnImportShadowing.js
index a8343370ea000..730c71a4459ae 100644
--- a/tests/baselines/reference/noCrashOnImportShadowing.js
+++ b/tests/baselines/reference/noCrashOnImportShadowing.js
@@ -33,84 +33,18 @@ exports.zzz = void 0;
 exports.zzz = 123;
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.B = void 0;
-var B = __importStar(require("./b"));
+var B = require("./b");
 exports.B = B;
 var x = { x: "" };
 B.zzz;
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 var x = { x: "" };
 a_1.B.zzz;
-var OriginalB = __importStar(require("./b"));
+var OriginalB = require("./b");
 OriginalB.zzz;
 var y = x;
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt
deleted file mode 100644
index 693651860fc9d..0000000000000
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 0.d.ts (0 errors) ====
-    export = a;
-    declare var a: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
index 7ad4ea8858b04..1c7d11cc7fa23 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 1.ts (1 errors) ====
     export var j = "hello"; // error
     ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
index ba676c872cc92..0a62b57721c02 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== 0.d.ts (0 errors) ====
     export = a;
     declare var a: number;
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.errors.txt b/tests/baselines/reference/noImplicitUseStrict_amd.errors.txt
index e7b3c26f924dd..22b673a5b420c 100644
--- a/tests/baselines/reference/noImplicitUseStrict_amd.errors.txt
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.errors.txt
@@ -1,8 +1,6 @@
 error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== noImplicitUseStrict_amd.ts (0 errors) ====
     export var x = 0;
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.errors.txt b/tests/baselines/reference/noImplicitUseStrict_system.errors.txt
index c2aa7f00a82e7..ecc0908057d97 100644
--- a/tests/baselines/reference/noImplicitUseStrict_system.errors.txt
+++ b/tests/baselines/reference/noImplicitUseStrict_system.errors.txt
@@ -1,8 +1,6 @@
 error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== noImplicitUseStrict_system.ts (0 errors) ====
     export var x = 0;
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.errors.txt b/tests/baselines/reference/noImplicitUseStrict_umd.errors.txt
index 97189216236cd..98e34e0171f66 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.errors.txt
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.errors.txt
@@ -1,8 +1,6 @@
 error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== noImplicitUseStrict_umd.ts (0 errors) ====
     export var x = 0;
\ No newline at end of file
diff --git a/tests/baselines/reference/nodeColonModuleResolution.js b/tests/baselines/reference/nodeColonModuleResolution.js
index 9991001cf4a0a..40ba92a641ebd 100644
--- a/tests/baselines/reference/nodeColonModuleResolution.js
+++ b/tests/baselines/reference/nodeColonModuleResolution.js
@@ -26,39 +26,6 @@ console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE)
 
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ph = __importStar(require("node:ph"));
+var ph = require("node:ph");
 console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE);
diff --git a/tests/baselines/reference/nodeColonModuleResolution2.js b/tests/baselines/reference/nodeColonModuleResolution2.js
index 4ac2ca8c3e69a..bbf0729e89776 100644
--- a/tests/baselines/reference/nodeColonModuleResolution2.js
+++ b/tests/baselines/reference/nodeColonModuleResolution2.js
@@ -21,39 +21,6 @@ console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE)
 
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ph = __importStar(require("fake:thing"));
+var ph = require("fake:thing");
 console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE);
diff --git a/tests/baselines/reference/objectIndexer.errors.txt b/tests/baselines/reference/objectIndexer.errors.txt
deleted file mode 100644
index 2095fa771df5b..0000000000000
--- a/tests/baselines/reference/objectIndexer.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== objectIndexer.ts (0 errors) ====
-    export interface Callback {
-        (value: any): void;
-    }
-    
-    interface IMap {
-        [s: string]: Callback;
-    }
-    
-    class Emitter {
-        private listeners: IMap;
-        constructor () {
-            this.listeners = {};
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectIndexer.types b/tests/baselines/reference/objectIndexer.types
index d67c0922f0793..835bfb70fff40 100644
--- a/tests/baselines/reference/objectIndexer.types
+++ b/tests/baselines/reference/objectIndexer.types
@@ -4,7 +4,6 @@
 export interface Callback {
     (value: any): void;
 >value : any
->      : ^^^
 }
 
 interface IMap {
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt b/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
deleted file mode 100644
index 757436d42452f..0000000000000
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== src/a.ts (0 errors) ====
-    import foo from "./b";
-    export default class Foo {}
-    foo();
-    
-==== src/b.ts (0 errors) ====
-    import Foo from "./a";
-    export default function foo() { new Foo(); }
-    
-    // https://github.com/microsoft/TypeScript/issues/37429
-    import("./a");
\ No newline at end of file
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
index 1b45a14d3f8ea..478d3b018971c 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
@@ -13,55 +13,17 @@ export default function foo() { new Foo(); }
 import("./a");
 
 //// [output.js]
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define("b", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = foo;
-    a_1 = __importDefault(a_1);
     function foo() { new a_1.default(); }
     // https://github.com/microsoft/TypeScript/issues/37429
-    new Promise((resolve_1, reject_1) => { require(["a"], resolve_1, reject_1); }).then(__importStar);
+    new Promise((resolve_1, reject_1) => { require(["a"], resolve_1, reject_1); });
 });
 define("a", ["require", "exports", "b"], function (require, exports, b_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    b_1 = __importDefault(b_1);
     class Foo {
     }
     exports.default = Foo;
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt b/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
deleted file mode 100644
index 978901f629afd..0000000000000
--- a/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== src/a.ts (0 errors) ====
-    import foo from "./b";
-    export default class Foo {}
-    foo();
-    
-==== src/b.ts (0 errors) ====
-    import Foo from "./a";
-    export default function foo() { new Foo(); }
-    
-    // https://github.com/microsoft/TypeScript/issues/37429
-    import("./a");
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.errors.txt b/tests/baselines/reference/outModuleConcatAmd.errors.txt
deleted file mode 100644
index bf1bdc018fc57..0000000000000
--- a/tests/baselines/reference/outModuleConcatAmd.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import {A} from "./ref/a";
-    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.errors.txt b/tests/baselines/reference/outModuleConcatSystem.errors.txt
deleted file mode 100644
index 635a9186a3446..0000000000000
--- a/tests/baselines/reference/outModuleConcatSystem.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/a.ts (0 errors) ====
-    export class A { }
-    
-==== b.ts (0 errors) ====
-    import {A} from "./ref/a";
-    export class B extends A { }
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatUmd.errors.txt b/tests/baselines/reference/outModuleConcatUmd.errors.txt
index 142e3121e87af..c4a744578f784 100644
--- a/tests/baselines/reference/outModuleConcatUmd.errors.txt
+++ b/tests/baselines/reference/outModuleConcatUmd.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/a.ts (0 errors) ====
     export class A { }
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt b/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
deleted file mode 100644
index 743cc840fe165..0000000000000
--- a/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/a.ts (0 errors) ====
-    /// <reference path="./b.ts" />
-    export class A {
-    	member: typeof GlobalFoo;
-    }
-    
-==== ref/b.ts (0 errors) ====
-    /// <reference path="./c.d.ts" />
-    class Foo {
-    	member: Bar;
-    }
-    declare var GlobalFoo: Foo;
-    
-==== ref/c.d.ts (0 errors) ====
-    /// <reference path="./d.d.ts" />
-    declare class Bar {
-    	member: Baz;
-    }
-    
-==== ref/d.d.ts (0 errors) ====
-    declare class Baz {
-    	member: number;
-    }
-    
-==== b.ts (0 errors) ====
-    import {A} from "./ref/a";
-    export class B extends A { }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/packageJsonExportsOptionsCompat.errors.txt b/tests/baselines/reference/packageJsonExportsOptionsCompat.errors.txt
index 3ff1544aade3e..435349fe337d7 100644
--- a/tests/baselines/reference/packageJsonExportsOptionsCompat.errors.txt
+++ b/tests/baselines/reference/packageJsonExportsOptionsCompat.errors.txt
@@ -1,15 +1,12 @@
-/tsconfig.json(3,25): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /tsconfig.json(4,5): error TS5098: Option 'customConditions' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
 /tsconfig.json(5,5): error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
 /tsconfig.json(6,5): error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
 
 
-==== /tsconfig.json (4 errors) ====
+==== /tsconfig.json (3 errors) ====
     {
       "compilerOptions": {
         "moduleResolution": "classic",
-                            ~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "customConditions": ["webpack", "browser"],
         ~~~~~~~~~~~~~~~~~~
 !!! error TS5098: Option 'customConditions' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
diff --git a/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt b/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt
index bc6129833a4db..5d90d36e485be 100644
--- a/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt
@@ -1,10 +1,8 @@
 error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
 error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
 !!! error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== index.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_amd.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution1_amd.errors.txt
index cbc48cbb0ad9a..71451c8ef60dd 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_amd.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_amd.errors.txt
@@ -1,13 +1,10 @@
-c:/root/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c:/root/tsconfig.json(5,17): error TS5090: Non-relative paths are not allowed when 'baseUrl' is not set. Did you forget a leading './'?
 c:/root/tsconfig.json(6,17): error TS5090: Non-relative paths are not allowed when 'baseUrl' is not set. Did you forget a leading './'?
 
 
-==== c:/root/tsconfig.json (3 errors) ====
+==== c:/root/tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "paths": {
                 "*": [
                     "*",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
index 2576b70838980..9bf5684ae2246 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
@@ -1,15 +1,12 @@
-root/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 root/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 root/tsconfig.json(5,13): error TS5061: Pattern '*1*' can have at most one '*' character.
 root/tsconfig.json(5,22): error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character.
 
 
-==== root/tsconfig.json (4 errors) ====
+==== root/tsconfig.json (3 errors) ====
     {
         "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "baseUrl": "./src",
             ~~~~~~~~~
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt
index 954947986d00f..bf2a1722d9382 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt
@@ -1,13 +1,9 @@
 error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== c:/root/folder1/file1.ts (0 errors) ====
     import {x} from "folder2/file2"
     declare function use(a: any): void;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt
index e26a99f3bff90..61d7593307575 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt
@@ -1,16 +1,10 @@
-c:/root/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-c:/root/tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c:/root/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== c:/root/tsconfig.json (3 errors) ====
+==== c:/root/tsconfig.json (1 errors) ====
     {
         "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "baseUrl": "."
             ~~~~~~~~~
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt
index 21f6617166d4c..51743201f5ee8 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt
@@ -1,13 +1,10 @@
-c:/root/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c:/root/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== c:/root/tsconfig.json (2 errors) ====
+==== c:/root/tsconfig.json (1 errors) ====
     {
         "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "baseUrl": ".",
             ~~~~~~~~~
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt
deleted file mode 100644
index 23c68b4af9411..0000000000000
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-c:/root/src/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== c:/root/src/tsconfig.json (1 errors) ====
-    {
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "rootDirs": [
-                ".",
-                "../generated/src"
-            ]
-        }
-    }
-    
-==== c:/root/src/file1.ts (0 errors) ====
-    import {x} from "./project/file3";
-    declare function use(x: string);
-    use(x.toExponential());
-    
-==== c:/root/src/file2.d.ts (0 errors) ====
-    export let x: number;
-    
-==== c:/root/generated/src/project/file3.ts (0 errors) ====
-    export {x} from "../file2";
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types
index ec6e6bf5fc670..2bdb131bb68b1 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types
@@ -13,7 +13,6 @@ declare function use(x: string);
 
 use(x.toExponential());
 >use(x.toExponential()) : any
->                       : ^^^
 >use : (x: string) => any
 >    : ^ ^^      ^^^^^^^^
 >x.toExponential() : string
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.errors.txt
index 5508ee7c19e1f..f6b1b6492a1a2 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.errors.txt
@@ -1,13 +1,10 @@
-c:/root/src/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c:/root/src/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== c:/root/src/tsconfig.json (2 errors) ====
+==== c:/root/src/tsconfig.json (1 errors) ====
     {
         "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "baseUrl": "../",
             ~~~~~~~~~
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt
index 95c012f361034..d5b374cce184c 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt
@@ -1,16 +1,10 @@
-c:/root/tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-c:/root/tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 c:/root/tsconfig.json(3,9): error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-==== c:/root/tsconfig.json (3 errors) ====
+==== c:/root/tsconfig.json (1 errors) ====
     {
         "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
             "baseUrl": ".",
             ~~~~~~~~~
 !!! error TS5101: Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt
index d120082362e17..aed0d9c6b8c59 100644
--- a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt
+++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 prefixUnaryOperatorsOnExportedVariables.ts(19,5): error TS2873: This kind of expression is always falsy.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== prefixUnaryOperatorsOnExportedVariables.ts (1 errors) ====
     export var x = false;
     export var y = 1;
diff --git a/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt b/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
index 6ec5a25b34247..6421fbec30524 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
@@ -1,11 +1,9 @@
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== preserveValueImports_module.ts (0 errors) ====
     export {};
     
\ No newline at end of file
diff --git a/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt b/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
index 86cb91cee5af7..6421fbec30524 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
@@ -1,11 +1,9 @@
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== preserveValueImports_module.ts (0 errors) ====
     export {};
     
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
deleted file mode 100644
index 2db8c409f81c0..0000000000000
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyCheckAnonymousFunctionParameter2.ts (0 errors) ====
-    export var x = 1;  // Makes this an external module 
-    interface Iterator<T> { x: T }
-    
-    namespace Q {
-        export function foo<T>(x: (a: Iterator<T>) => number) {
-            return x;
-        }
-    }
-    
-    namespace Q {
-        function bar() {
-            foo(null);
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.errors.txt b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.errors.txt
deleted file mode 100644
index 000fe280b9dd0..0000000000000
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts (0 errors) ====
-    export interface A<T> {
-        f1(callback: (p: T) => any); 
-    }
-     
-    export interface B<T> extends A<T> {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
deleted file mode 100644
index 89511809e6112..0000000000000
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyCheckExportAssignmentOnExportedGenericInterface2.ts (0 errors) ====
-    export = Foo;
-    
-    interface Foo<T> {
-    }
-    
-    function Foo<T>(array: T[]): Foo<T> {
-        return undefined;
-    }
-    
-    namespace Foo {
-        export var x = "hello";
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.errors.txt b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.errors.txt
deleted file mode 100644
index 7dc06a25ca05d..0000000000000
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyCheckOnTypeParameterReferenceInConstructorParameter.ts (0 errors) ====
-    export class A<T1>{
-        constructor(callback: (self: A<T1>) => void) {
-            var child = new B(this);
-        }
-    }
-    
-    export class B<T2> {
-        constructor(parent: T2) { }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGetter.errors.txt b/tests/baselines/reference/privacyGetter.errors.txt
deleted file mode 100644
index e8b11e2d53e4b..0000000000000
--- a/tests/baselines/reference/privacyGetter.errors.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyGetter.ts (0 errors) ====
-    export namespace m1 {
-        export class C1_public {
-            private f1() {
-            }
-        }
-    
-        class C2_private {
-        }
-    
-        export class C3_public {
-            private get p1_private() {
-                return new C1_public();
-            }
-    
-            private set p1_private(m1_c3_p1_arg: C1_public) {
-            }
-    
-            private get p2_private() {
-                return new C1_public();
-            }
-    
-            private set p2_private(m1_c3_p2_arg: C1_public) {
-            }
-    
-            private get p3_private() {
-                return new C2_private();
-            }
-    
-            private set p3_private(m1_c3_p3_arg: C2_private) {
-            }
-    
-            public get p4_public(): C2_private { // error
-                return new C2_private(); //error
-            }
-    
-            public set p4_public(m1_c3_p4_arg: C2_private) { // error
-            }
-        }
-    
-        class C4_private {
-            private get p1_private() {
-                return new C1_public();
-            }
-    
-            private set p1_private(m1_c3_p1_arg: C1_public) {
-            }
-    
-            private get p2_private() {
-                return new C1_public();
-            }
-    
-            private set p2_private(m1_c3_p2_arg: C1_public) {
-            }
-    
-            private get p3_private() {
-                return new C2_private();
-            }
-    
-            private set p3_private(m1_c3_p3_arg: C2_private) {
-            }
-    
-            public get p4_public(): C2_private {
-                return new C2_private();
-            }
-    
-            public set p4_public(m1_c3_p4_arg: C2_private) {
-            }
-        }
-    }
-    
-    namespace m2 {
-        export class m2_C1_public {
-            private f1() {
-            }
-        }
-    
-        class m2_C2_private {
-        }
-    
-        export class m2_C3_public {
-            private get p1_private() {
-                return new m2_C1_public();
-            }
-    
-            private set p1_private(m2_c3_p1_arg: m2_C1_public) {
-            }
-    
-            private get p2_private() {
-                return new m2_C1_public();
-            }
-    
-            private set p2_private(m2_c3_p2_arg: m2_C1_public) {
-            }
-    
-            private get p3_private() {
-                return new m2_C2_private();
-            }
-    
-            private set p3_private(m2_c3_p3_arg: m2_C2_private) {
-            }
-    
-            public get p4_public(): m2_C2_private {
-                return new m2_C2_private();
-            }
-    
-            public set p4_public(m2_c3_p4_arg: m2_C2_private) {
-            }
-        }
-    
-        class m2_C4_private {
-            private get p1_private() {
-                return new m2_C1_public();
-            }
-    
-            private set p1_private(m2_c3_p1_arg: m2_C1_public) {
-            }
-    
-            private get p2_private() {
-                return new m2_C1_public();
-            }
-    
-            private set p2_private(m2_c3_p2_arg: m2_C1_public) {
-            }
-    
-            private get p3_private() {
-                return new m2_C2_private();
-            }
-    
-            private set p3_private(m2_c3_p3_arg: m2_C2_private) {
-            }
-    
-            public get p4_public(): m2_C2_private {
-                return new m2_C2_private();
-            }
-    
-            public set p4_public(m2_c3_p4_arg: m2_C2_private) {
-            }
-        }
-    }
-    
-    class C5_private {
-        private f() {
-        }
-    }
-    
-    export class C6_public {
-    }
-    
-    export class C7_public {
-        private get p1_private() {
-            return new C6_public();
-        }
-    
-        private set p1_private(m1_c3_p1_arg: C6_public) {
-        }
-    
-        private get p2_private() {
-            return new C6_public();
-        }
-    
-        private set p2_private(m1_c3_p2_arg: C6_public) {
-        }
-    
-        private get p3_private() {
-            return new C5_private();
-        }
-    
-        private set p3_private(m1_c3_p3_arg: C5_private) {
-        }
-    
-        public get p4_public(): C5_private { // error
-            return new C5_private(); //error
-        }
-    
-        public set p4_public(m1_c3_p4_arg: C5_private) { // error
-        }
-    }
-    
-    class C8_private {
-        private get p1_private() {
-            return new C6_public();
-        }
-    
-        private set p1_private(m1_c3_p1_arg: C6_public) {
-        }
-    
-        private get p2_private() {
-            return new C6_public();
-        }
-    
-        private set p2_private(m1_c3_p2_arg: C6_public) {
-        }
-    
-        private get p3_private() {
-            return new C5_private();
-        }
-    
-        private set p3_private(m1_c3_p3_arg: C5_private) {
-        }
-    
-        public get p4_public(): C5_private {
-            return new C5_private();
-        }
-    
-        public set p4_public(m1_c3_p4_arg: C5_private) {
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloFunc.errors.txt b/tests/baselines/reference/privacyGloFunc.errors.txt
deleted file mode 100644
index 0a8e3f15038f0..0000000000000
--- a/tests/baselines/reference/privacyGloFunc.errors.txt
+++ /dev/null
@@ -1,535 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyGloFunc.ts (0 errors) ====
-    export namespace m1 {
-        export class C1_public {
-            private f1() {
-            }
-        }
-    
-        class C2_private {
-        }
-    
-        export class C3_public {
-            constructor (m1_c3_c1: C1_public);
-            constructor (m1_c3_c2: C2_private); //error
-            constructor (m1_c3_c1_2: any) {
-            }
-    
-            private f1_private(m1_c3_f1_arg: C1_public) {
-            }
-    
-            public f2_public(m1_c3_f2_arg: C1_public) {
-            }
-    
-            private f3_private(m1_c3_f3_arg: C2_private) {
-            }
-    
-            public f4_public(m1_c3_f4_arg: C2_private) { // error
-            }
-    
-            private f5_private() {
-                return new C1_public();
-            }
-    
-            public f6_public() {
-                return new C1_public();
-            }
-    
-            private f7_private() {
-                return new C2_private();
-            }
-    
-            public f8_public() {
-                return new C2_private();  // error
-            }
-    
-            private f9_private(): C1_public {
-                return new C1_public();
-            }
-    
-            public f10_public(): C1_public {
-                return new C1_public();
-            }
-    
-            private f11_private(): C2_private {
-                return new C2_private();
-            }
-    
-            public f12_public(): C2_private { // error
-                return new C2_private(); //error
-            }
-        }
-    
-        class C4_private {
-            constructor (m1_c4_c1: C1_public);
-            constructor (m1_c4_c2: C2_private);
-            constructor (m1_c4_c1_2: any) {
-            }
-            private f1_private(m1_c4_f1_arg: C1_public) {
-            }
-    
-            public f2_public(m1_c4_f2_arg: C1_public) {
-            }
-    
-            private f3_private(m1_c4_f3_arg: C2_private) {
-            }
-    
-            public f4_public(m1_c4_f4_arg: C2_private) {
-            }
-    
-    
-            private f5_private() {
-                return new C1_public();
-            }
-    
-            public f6_public() {
-                return new C1_public();
-            }
-    
-            private f7_private() {
-                return new C2_private();
-            }
-    
-            public f8_public() {
-                return new C2_private();
-            }
-    
-    
-            private f9_private(): C1_public {
-                return new C1_public();
-            }
-    
-            public f10_public(): C1_public {
-                return new C1_public();
-            }
-    
-            private f11_private(): C2_private {
-                return new C2_private();
-            }
-    
-            public f12_public(): C2_private {
-                return new C2_private();
-            }
-        }
-    
-        export class C5_public {
-            constructor (m1_c5_c: C1_public) {
-            }
-        }
-        
-        class C6_private {
-            constructor (m1_c6_c: C1_public) {
-            }
-        }
-        export class C7_public {
-            constructor (m1_c7_c: C2_private) { // error
-            }
-        }
-        
-        class C8_private {
-            constructor (m1_c8_c: C2_private) {
-            }
-        }
-    
-        function f1_public(m1_f1_arg: C1_public) {
-        }
-    
-        export function f2_public(m1_f2_arg: C1_public) {
-        }
-    
-        function f3_public(m1_f3_arg: C2_private) {
-        }
-    
-        export function f4_public(m1_f4_arg: C2_private) { // error
-        }
-    
-    
-        function f5_public() {
-            return new C1_public();
-        }
-    
-        export function f6_public() {
-            return new C1_public();
-        }
-    
-        function f7_public() {
-            return new C2_private();
-        }
-    
-        export function f8_public() {
-            return new C2_private();  // error
-        }
-    
-    
-        function f9_private(): C1_public {
-            return new C1_public();
-        }
-    
-        export function f10_public(): C1_public {
-            return new C1_public();
-        }
-    
-        function f11_private(): C2_private {
-            return new C2_private();
-        }
-    
-        export function f12_public(): C2_private { // error
-            return new C2_private(); //error
-        }
-    }
-    
-    namespace m2 {
-        export class m2_C1_public {
-            private f() {
-            }
-        }
-    
-        class m2_C2_private {
-        }
-    
-        export class m2_C3_public {
-            constructor (m2_c3_c1: m2_C1_public);
-            constructor (m2_c3_c2: m2_C2_private);
-            constructor (m2_c3_c1_2: any) {
-            }
-    
-            private f1_private(m2_c3_f1_arg: m2_C1_public) {
-            }
-    
-            public f2_public(m2_c3_f2_arg: m2_C1_public) {
-            }
-    
-            private f3_private(m2_c3_f3_arg: m2_C2_private) {
-            }
-    
-            public f4_public(m2_c3_f4_arg: m2_C2_private) {
-            }
-    
-            private f5_private() {
-                return new m2_C1_public();
-            }
-    
-            public f6_public() {
-                return new m2_C1_public();
-            }
-    
-            private f7_private() {
-                return new m2_C2_private();
-            }
-    
-            public f8_public() {
-                return new m2_C2_private();
-            }
-    
-            private f9_private(): m2_C1_public {
-                return new m2_C1_public();
-            }
-    
-            public f10_public(): m2_C1_public {
-                return new m2_C1_public();
-            }
-    
-            private f11_private(): m2_C2_private {
-                return new m2_C2_private();
-            }
-    
-            public f12_public(): m2_C2_private {
-                return new m2_C2_private();
-            }
-        }
-    
-        class m2_C4_private {
-            constructor (m2_c4_c1: m2_C1_public);
-            constructor (m2_c4_c2: m2_C2_private);
-            constructor (m2_c4_c1_2: any) {
-            }
-    
-            private f1_private(m2_c4_f1_arg: m2_C1_public) {
-            }
-    
-            public f2_public(m2_c4_f2_arg: m2_C1_public) {
-            }
-    
-            private f3_private(m2_c4_f3_arg: m2_C2_private) {
-            }
-    
-            public f4_public(m2_c4_f4_arg: m2_C2_private) {
-            }
-    
-    
-            private f5_private() {
-                return new m2_C1_public();
-            }
-    
-            public f6_public() {
-                return new m2_C1_public();
-            }
-    
-            private f7_private() {
-                return new m2_C2_private();
-            }
-    
-            public f8_public() {
-                return new m2_C2_private();
-            }
-    
-    
-            private f9_private(): m2_C1_public {
-                return new m2_C1_public();
-            }
-    
-            public f10_public(): m2_C1_public {
-                return new m2_C1_public();
-            }
-    
-            private f11_private(): m2_C2_private {
-                return new m2_C2_private();
-            }
-    
-            public f12_public(): m2_C2_private {
-                return new m2_C2_private();
-            }
-        }
-    
-        export class m2_C5_public {
-            constructor (m2_c5_c: m2_C1_public) {
-            }
-        }
-        
-        class m2_C6_private {
-            constructor (m2_c6_c: m2_C1_public) {
-            }
-        }
-        export class m2_C7_public {
-            constructor (m2_c7_c: m2_C2_private) { 
-            }
-        }
-        
-        class m2_C8_private {
-            constructor (m2_c8_c: m2_C2_private) {
-            }
-        }
-    
-        function f1_public(m2_f1_arg: m2_C1_public) {
-        }
-    
-        export function f2_public(m2_f2_arg: m2_C1_public) {
-        }
-    
-        function f3_public(m2_f3_arg: m2_C2_private) {
-        }
-    
-        export function f4_public(m2_f4_arg: m2_C2_private) {
-        }
-    
-    
-        function f5_public() {
-            return new m2_C1_public();
-        }
-    
-        export function f6_public() {
-            return new m2_C1_public();
-        }
-    
-        function f7_public() {
-            return new m2_C2_private();
-        }
-    
-        export function f8_public() {
-            return new m2_C2_private();
-        }
-    
-    
-        function f9_private(): m2_C1_public {
-            return new m2_C1_public();
-        }
-    
-        export function f10_public(): m2_C1_public {
-            return new m2_C1_public();
-        }
-    
-        function f11_private(): m2_C2_private {
-            return new m2_C2_private();
-        }
-    
-        export function f12_public(): m2_C2_private {
-            return new m2_C2_private();
-        }
-    }
-    
-    class C5_private {
-        private f() {
-        }
-    }
-    
-    export class C6_public {
-    }
-    
-    export class C7_public {
-        constructor (c7_c1: C5_private); // error
-        constructor (c7_c2: C6_public);
-        constructor (c7_c1_2: any) {
-        }
-        private f1_private(c7_f1_arg: C6_public) {
-        }
-    
-        public f2_public(c7_f2_arg: C6_public) {
-        }
-    
-        private f3_private(c7_f3_arg: C5_private) {
-        }
-    
-        public f4_public(c7_f4_arg: C5_private) { //error
-        }
-    
-        private f5_private() {
-            return new C6_public();
-        }
-    
-        public f6_public() {
-            return new C6_public();
-        }
-    
-        private f7_private() {
-            return new C5_private();
-        }
-    
-        public f8_public() {
-            return new C5_private(); //error
-        }
-    
-        private f9_private(): C6_public {
-            return new C6_public();
-        }
-    
-        public f10_public(): C6_public {
-            return new C6_public();
-        }
-    
-        private f11_private(): C5_private {
-            return new C5_private();
-        }
-    
-        public f12_public(): C5_private { //error
-            return new C5_private(); //error
-        }
-    }
-    
-    class C8_private {
-        constructor (c8_c1: C5_private);
-        constructor (c8_c2: C6_public);
-        constructor (c8_c1_2: any) {
-        }
-            
-        private f1_private(c8_f1_arg: C6_public) {
-        }
-    
-        public f2_public(c8_f2_arg: C6_public) {
-        }
-    
-        private f3_private(c8_f3_arg: C5_private) {
-        }
-    
-        public f4_public(c8_f4_arg: C5_private) {
-        }
-    
-        private f5_private() {
-            return new C6_public();
-        }
-    
-        public f6_public() {
-            return new C6_public();
-        }
-    
-        private f7_private() {
-            return new C5_private();
-        }
-    
-        public f8_public() {
-            return new C5_private();
-        }
-    
-        private f9_private(): C6_public {
-            return new C6_public();
-        }
-    
-        public f10_public(): C6_public {
-            return new C6_public();
-        }
-    
-        private f11_private(): C5_private {
-            return new C5_private();
-        }
-    
-        public f12_public(): C5_private {
-            return new C5_private();
-        }
-    }
-    
-    
-    export class C9_public {
-        constructor (c9_c: C6_public) {
-        }
-    }
-        
-    class C10_private {
-        constructor (c10_c: C6_public) {
-        }
-    }
-    export class C11_public {
-        constructor (c11_c: C5_private) { // error
-        }
-    }
-        
-    class C12_private {
-        constructor (c12_c: C5_private) {
-        }
-    }
-    
-    function f1_private(f1_arg: C5_private) {
-    }
-    
-    export function f2_public(f2_arg: C5_private) { // error
-    }
-    
-    function f3_private(f3_arg: C6_public) {
-    }
-    
-    export function f4_public(f4_arg: C6_public) {
-    }
-    
-    function f5_private() {
-        return new C6_public();
-    }
-    
-    export function f6_public() {
-        return new C6_public();
-    }
-    
-    function f7_private() {
-        return new C5_private();
-    }
-    
-    export function f8_public() {
-        return new C5_private(); //error
-    }
-    
-    function f9_private(): C6_public {
-        return new C6_public();
-    }
-    
-    export function f10_public(): C6_public {
-        return new C6_public();
-    }
-    
-    function f11_private(): C5_private {
-        return new C5_private();
-    }
-    
-    export function f12_public(): C5_private { //error 
-        return new C5_private(); //error
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types
index b7ed3bcf1c037..b014aa9696281 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -34,7 +34,6 @@ export namespace m1 {
 
         constructor (m1_c3_c1_2: any) {
 >m1_c3_c1_2 : any
->           : ^^^
         }
 
         private f1_private(m1_c3_f1_arg: C1_public) {
@@ -168,7 +167,6 @@ export namespace m1 {
 
         constructor (m1_c4_c1_2: any) {
 >m1_c4_c1_2 : any
->           : ^^^
         }
         private f1_private(m1_c4_f1_arg: C1_public) {
 >f1_private : (m1_c4_f1_arg: C1_public) => void
@@ -480,7 +478,6 @@ namespace m2 {
 
         constructor (m2_c3_c1_2: any) {
 >m2_c3_c1_2 : any
->           : ^^^
         }
 
         private f1_private(m2_c3_f1_arg: m2_C1_public) {
@@ -614,7 +611,6 @@ namespace m2 {
 
         constructor (m2_c4_c1_2: any) {
 >m2_c4_c1_2 : any
->           : ^^^
         }
 
         private f1_private(m2_c4_f1_arg: m2_C1_public) {
@@ -923,7 +919,6 @@ export class C7_public {
 
     constructor (c7_c1_2: any) {
 >c7_c1_2 : any
->        : ^^^
     }
     private f1_private(c7_f1_arg: C6_public) {
 >f1_private : (c7_f1_arg: C6_public) => void
@@ -1056,7 +1051,6 @@ class C8_private {
 
     constructor (c8_c1_2: any) {
 >c8_c1_2 : any
->        : ^^^
     }
         
     private f1_private(c8_f1_arg: C6_public) {
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
deleted file mode 100644
index f4b5c64768dd3..0000000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyLocalInternalReferenceImportWithoutExport.ts (0 errors) ====
-    // private elements
-    namespace m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export namespace mi_private {
-            export class c {
-            }
-        }
-        export namespace mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export namespace m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export namespace mi_public {
-            export class c {
-            }
-        }
-        export namespace mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    export namespace import_public {
-        // No Privacy errors - importing private elements
-        import im_private_c_private = m_private.c_private;
-        import im_private_e_private = m_private.e_private;
-        import im_private_f_private = m_private.f_private;
-        import im_private_v_private = m_private.v_private;
-        import im_private_i_private = m_private.i_private;
-        import im_private_mi_private = m_private.mi_private;
-        import im_private_mu_private = m_private.mu_private;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-    
-        // No Privacy errors - importing public elements
-        import im_private_c_public = m_public.c_public;
-        import im_private_e_public = m_public.e_public;
-        import im_private_f_public = m_public.f_public;
-        import im_private_v_public = m_public.v_public;
-        import im_private_i_public = m_public.i_public;
-        import im_private_mi_public = m_public.mi_public;
-        import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
-    
-    namespace import_private {
-        // No Privacy errors - importing private elements
-        import im_private_c_private = m_private.c_private;
-        import im_private_e_private = m_private.e_private;
-        import im_private_f_private = m_private.f_private;
-        import im_private_v_private = m_private.v_private;
-        import im_private_i_private = m_private.i_private;
-        import im_private_mi_private = m_private.mi_private;
-        import im_private_mu_private = m_private.mu_private;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-        // No privacy Error - importing public elements
-        import im_private_c_public = m_public.c_public;
-        import im_private_e_public = m_public.e_public;
-        import im_private_f_public = m_public.f_public;
-        import im_private_v_public = m_public.v_public;
-        import im_private_i_public = m_public.i_public;
-        import im_private_mi_public = m_public.mi_public;
-        import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
index eeb5964c4b96c..1ecaca60d6aa6 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
@@ -8,8 +8,8 @@ privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts(17,12): error TS
     // Privacy errors - importing private elements
     import im_private_mi_private = require("m");
     import im_private_mu_private = require("m2");
-    import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
-    import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+    import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+    import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
     
     // Usage of privacy error imports
     var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index 22660575e21ed..1a60272b6e577 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -33,8 +33,8 @@ declare module 'm2' {
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
-import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
-import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
 
 // Usage of privacy error imports
 var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
@@ -50,45 +50,45 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.c_public = void 0;
-// Public elements
-var c_public = /** @class */ (function () {
-    function c_public() {
-    }
-    return c_public;
-}());
-exports.c_public = c_public;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.c_public = void 0;
+    // Public elements
+    var c_public = /** @class */ (function () {
+        function c_public() {
+        }
+        return c_public;
+    }());
+    exports.c_public = c_public;
+});
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.c_public = void 0;
-var c_public = /** @class */ (function () {
-    function c_public() {
-    }
-    return c_public;
-}());
-exports.c_public = c_public;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.c_public = void 0;
+    var c_public = /** @class */ (function () {
+        function c_public() {
+        }
+        return c_public;
+    }());
+    exports.c_public = c_public;
+});
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.publicUse_im_private_mi_public = exports.publicUse_im_private_mu_private = exports.publicUse_im_private_mi_private = void 0;
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
-// Privacy errors - importing private elements
-var im_private_mi_private = require("m");
-var im_private_mu_private = require("m2");
-var im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
-// Usage of privacy error imports
-var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
-exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private();
-var privateUse_im_private_mu_private = new im_private_mu_private.c_private();
-exports.publicUse_im_private_mu_private = new im_private_mu_private.c_private();
-var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
-exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
-var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
-exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleImportWithoutExport_require"], function (require, exports, im_private_mi_private, im_private_mu_private, im_private_mi_public) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.publicUse_im_private_mi_public = exports.publicUse_im_private_mu_private = exports.publicUse_im_private_mi_private = void 0;
+    // Usage of privacy error imports
+    var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
+    exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private();
+    var privateUse_im_private_mu_private = new im_private_mu_private.c_private();
+    exports.publicUse_im_private_mu_private = new im_private_mu_private.c_private();
+    var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
+    exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+    var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
+    exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+});
 
 
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts]
@@ -114,7 +114,7 @@ export declare class c_public {
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.d.ts]
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
-import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
 export declare var publicUse_im_private_mi_private: im_private_mi_private.c_private;
 export declare var publicUse_im_private_mu_private: im_private_mu_private.c_private;
 export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols
index a3d75551a39b8..2d499c0ba7207 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols
@@ -10,11 +10,11 @@ import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
 >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 3, 44))
 
-import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
 >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 4, 45))
 
-import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
->im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 5, 107))
+import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+>im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 5, 105))
 
 // Usage of privacy error imports
 var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
index b6028d861566b..4864e24a2b60f 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
@@ -12,11 +12,11 @@ import im_private_mu_private = require("m2");
 >im_private_mu_private : typeof im_private_mu_private
 >                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
 >im_private_mi_public : typeof im_private_mi_public
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
 >im_private_mu_public : typeof im_private_mu_public
 >                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
deleted file mode 100644
index 1569b84214a0a..0000000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyTopLevelInternalReferenceImportWithExport.ts (0 errors) ====
-    // private elements
-    namespace m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export namespace mi_private {
-            export class c {
-            }
-        }
-        export namespace mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export namespace m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export namespace mi_public {
-            export class c {
-            }
-        }
-        export namespace mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    // Privacy errors - importing private elements
-    export import im_public_c_private = m_private.c_private;
-    export import im_public_e_private = m_private.e_private;
-    export import im_public_f_private = m_private.f_private;
-    export import im_public_v_private = m_private.v_private;
-    export import im_public_i_private = m_private.i_private;
-    export import im_public_mi_private = m_private.mi_private;
-    export import im_public_mu_private = m_private.mu_private;
-    
-    // Usage of privacy error imports
-    var privateUse_im_public_c_private = new im_public_c_private();
-    export var publicUse_im_public_c_private = new im_public_c_private();
-    var privateUse_im_public_e_private = im_public_e_private.Happy;
-    export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
-    var privateUse_im_public_f_private = im_public_f_private();
-    export var publicUse_im_public_f_private = im_public_f_private();
-    var privateUse_im_public_v_private = im_public_v_private;
-    export var publicUse_im_public_v_private = im_public_v_private;
-    var privateUse_im_public_i_private: im_public_i_private;
-    export var publicUse_im_public_i_private: im_public_i_private;
-    var privateUse_im_public_mi_private = new im_public_mi_private.c();
-    export var publicUse_im_public_mi_private = new im_public_mi_private.c();
-    var privateUse_im_public_mu_private: im_public_mu_private.i;
-    export var publicUse_im_public_mu_private: im_public_mu_private.i;
-    
-    
-    // No Privacy errors - importing public elements
-    export import im_public_c_public = m_public.c_public;
-    export import im_public_e_public = m_public.e_public;
-    export import im_public_f_public = m_public.f_public;
-    export import im_public_v_public = m_public.v_public;
-    export import im_public_i_public = m_public.i_public;
-    export import im_public_mi_public = m_public.mi_public;
-    export import im_public_mu_public = m_public.mu_public;
-    
-    // Usage of above decls
-    var privateUse_im_public_c_public = new im_public_c_public();
-    export var publicUse_im_public_c_public = new im_public_c_public();
-    var privateUse_im_public_e_public = im_public_e_public.Happy;
-    export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
-    var privateUse_im_public_f_public = im_public_f_public();
-    export var publicUse_im_public_f_public = im_public_f_public();
-    var privateUse_im_public_v_public = im_public_v_public;
-    export var publicUse_im_public_v_public = im_public_v_public;
-    var privateUse_im_public_i_public: im_public_i_public;
-    export var publicUse_im_public_i_public: im_public_i_public;
-    var privateUse_im_public_mi_public = new im_public_mi_public.c();
-    export var publicUse_im_public_mi_public = new im_public_mi_public.c();
-    var privateUse_im_public_mu_public: im_public_mu_public.i;
-    export var publicUse_im_public_mu_public: im_public_mu_public.i;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
deleted file mode 100644
index 39a66f745261a..0000000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privacyTopLevelInternalReferenceImportWithoutExport.ts (0 errors) ====
-    // private elements
-    namespace m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export namespace mi_private {
-            export class c {
-            }
-        }
-        export namespace mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export namespace m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export namespace mi_public {
-            export class c {
-            }
-        }
-        export namespace mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    // No Privacy errors - importing private elements
-    import im_private_c_private = m_private.c_private;
-    import im_private_e_private = m_private.e_private;
-    import im_private_f_private = m_private.f_private;
-    import im_private_v_private = m_private.v_private;
-    import im_private_i_private = m_private.i_private;
-    import im_private_mi_private = m_private.mi_private;
-    import im_private_mu_private = m_private.mu_private;
-    
-    // Usage of above decls
-    var privateUse_im_private_c_private = new im_private_c_private();
-    export var publicUse_im_private_c_private = new im_private_c_private();
-    var privateUse_im_private_e_private = im_private_e_private.Happy;
-    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-    var privateUse_im_private_f_private = im_private_f_private();
-    export var publicUse_im_private_f_private = im_private_f_private();
-    var privateUse_im_private_v_private = im_private_v_private;
-    export var publicUse_im_private_v_private = im_private_v_private;
-    var privateUse_im_private_i_private: im_private_i_private;
-    export var publicUse_im_private_i_private: im_private_i_private;
-    var privateUse_im_private_mi_private = new im_private_mi_private.c();
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-    var privateUse_im_private_mu_private: im_private_mu_private.i;
-    export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-    
-    // No Privacy errors - importing public elements
-    import im_private_c_public = m_public.c_public;
-    import im_private_e_public = m_public.e_public;
-    import im_private_f_public = m_public.f_public;
-    import im_private_v_public = m_public.v_public;
-    import im_private_i_public = m_public.i_public;
-    import im_private_mi_public = m_public.mi_public;
-    import im_private_mu_public = m_public.mu_public;
-    
-    // Usage of above decls
-    var privateUse_im_private_c_public = new im_private_c_public();
-    export var publicUse_im_private_c_public = new im_private_c_public();
-    var privateUse_im_private_e_public = im_private_e_public.Happy;
-    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-    var privateUse_im_private_f_public = im_private_f_public();
-    export var publicUse_im_private_f_public = im_private_f_public();
-    var privateUse_im_private_v_public = im_private_v_public;
-    export var publicUse_im_private_v_public = im_private_v_public;
-    var privateUse_im_private_i_public: im_private_i_public;
-    export var publicUse_im_private_i_public: im_private_i_public;
-    var privateUse_im_private_mi_public = new im_private_mi_public.c();
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-    var privateUse_im_private_mu_public: im_private_mu_public.i;
-    export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privateNameEmitHelpers.errors.txt b/tests/baselines/reference/privateNameEmitHelpers.errors.txt
index 92f3c7e9663d6..8b9314cc44bd1 100644
--- a/tests/baselines/reference/privateNameEmitHelpers.errors.txt
+++ b/tests/baselines/reference/privateNameEmitHelpers.errors.txt
@@ -13,7 +13,7 @@ main.ts(4,25): error TS2807: This syntax requires an imported helper named '__cl
 !!! error TS2807: This syntax requires an imported helper named '__classPrivateFieldGet' with 4 parameters, which is not compatible with the one in 'tslib'. Consider upgrading your version of 'tslib'.
     }
     
-==== node_modules/tslib/index.d.ts (0 errors) ====
+==== tslib.d.ts (0 errors) ====
     // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
     export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
     export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
diff --git a/tests/baselines/reference/privateNameEmitHelpers.js b/tests/baselines/reference/privateNameEmitHelpers.js
index 844aecf231cf1..1c46c25afa8fe 100644
--- a/tests/baselines/reference/privateNameEmitHelpers.js
+++ b/tests/baselines/reference/privateNameEmitHelpers.js
@@ -7,7 +7,7 @@ export class C {
     set #c(v: number) { this.#a += v; }
 }
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
diff --git a/tests/baselines/reference/privateNameEmitHelpers.symbols b/tests/baselines/reference/privateNameEmitHelpers.symbols
index b13f7512037e9..e3ba295c724e5 100644
--- a/tests/baselines/reference/privateNameEmitHelpers.symbols
+++ b/tests/baselines/reference/privateNameEmitHelpers.symbols
@@ -20,25 +20,25 @@ export class C {
 >v : Symbol(v, Decl(main.ts, 3, 11))
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
->__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(index.d.ts, 0, 0))
->T : Symbol(T, Decl(index.d.ts, 1, 47))
->V : Symbol(V, Decl(index.d.ts, 1, 64))
->receiver : Symbol(receiver, Decl(index.d.ts, 1, 68))
->T : Symbol(T, Decl(index.d.ts, 1, 47))
->state : Symbol(state, Decl(index.d.ts, 1, 80))
->V : Symbol(V, Decl(index.d.ts, 1, 64))
+>__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
+>receiver : Symbol(receiver, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>state : Symbol(state, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
 
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
->__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(index.d.ts, 1, 96))
->T : Symbol(T, Decl(index.d.ts, 2, 47))
->V : Symbol(V, Decl(index.d.ts, 2, 64))
->receiver : Symbol(receiver, Decl(index.d.ts, 2, 68))
->T : Symbol(T, Decl(index.d.ts, 2, 47))
->state : Symbol(state, Decl(index.d.ts, 2, 80))
->value : Symbol(value, Decl(index.d.ts, 2, 92))
->V : Symbol(V, Decl(index.d.ts, 2, 64))
->V : Symbol(V, Decl(index.d.ts, 2, 64))
+>__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
+>receiver : Symbol(receiver, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>state : Symbol(state, Decl(tslib.d.ts, --, --))
+>value : Symbol(value, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/privateNameEmitHelpers.types b/tests/baselines/reference/privateNameEmitHelpers.types
index 2e7be91970d54..69f0d4f6a284d 100644
--- a/tests/baselines/reference/privateNameEmitHelpers.types
+++ b/tests/baselines/reference/privateNameEmitHelpers.types
@@ -38,7 +38,7 @@ export class C {
 >  : ^^^^^^
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
 >__classPrivateFieldGet : <T extends object, V>(receiver: T, state: any) => V
diff --git a/tests/baselines/reference/privateNameStaticEmitHelpers.errors.txt b/tests/baselines/reference/privateNameStaticEmitHelpers.errors.txt
index 2b2cea73b5092..525d1034bf26b 100644
--- a/tests/baselines/reference/privateNameStaticEmitHelpers.errors.txt
+++ b/tests/baselines/reference/privateNameStaticEmitHelpers.errors.txt
@@ -13,7 +13,7 @@ main.ts(4,30): error TS2807: This syntax requires an imported helper named '__cl
 !!! error TS2807: This syntax requires an imported helper named '__classPrivateFieldGet' with 4 parameters, which is not compatible with the one in 'tslib'. Consider upgrading your version of 'tslib'.
     }
     
-==== node_modules/tslib/index.d.ts (0 errors) ====
+==== tslib.d.ts (0 errors) ====
     // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
     export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
     export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
diff --git a/tests/baselines/reference/privateNameStaticEmitHelpers.js b/tests/baselines/reference/privateNameStaticEmitHelpers.js
index 8ed176b162d1c..da1af623fe312 100644
--- a/tests/baselines/reference/privateNameStaticEmitHelpers.js
+++ b/tests/baselines/reference/privateNameStaticEmitHelpers.js
@@ -7,7 +7,7 @@ export class S {
     static get #c() { return S.#b(); }
 }
 
-//// [index.d.ts]
+//// [tslib.d.ts]
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
diff --git a/tests/baselines/reference/privateNameStaticEmitHelpers.symbols b/tests/baselines/reference/privateNameStaticEmitHelpers.symbols
index 681c0bd0efef7..6b1b76dfe9947 100644
--- a/tests/baselines/reference/privateNameStaticEmitHelpers.symbols
+++ b/tests/baselines/reference/privateNameStaticEmitHelpers.symbols
@@ -18,25 +18,25 @@ export class S {
 >S : Symbol(S, Decl(main.ts, 0, 0))
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
->__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(index.d.ts, 0, 0))
->T : Symbol(T, Decl(index.d.ts, 1, 47))
->V : Symbol(V, Decl(index.d.ts, 1, 64))
->receiver : Symbol(receiver, Decl(index.d.ts, 1, 68))
->T : Symbol(T, Decl(index.d.ts, 1, 47))
->state : Symbol(state, Decl(index.d.ts, 1, 80))
->V : Symbol(V, Decl(index.d.ts, 1, 64))
+>__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
+>receiver : Symbol(receiver, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>state : Symbol(state, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
 
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
->__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(index.d.ts, 1, 96))
->T : Symbol(T, Decl(index.d.ts, 2, 47))
->V : Symbol(V, Decl(index.d.ts, 2, 64))
->receiver : Symbol(receiver, Decl(index.d.ts, 2, 68))
->T : Symbol(T, Decl(index.d.ts, 2, 47))
->state : Symbol(state, Decl(index.d.ts, 2, 80))
->value : Symbol(value, Decl(index.d.ts, 2, 92))
->V : Symbol(V, Decl(index.d.ts, 2, 64))
->V : Symbol(V, Decl(index.d.ts, 2, 64))
+>__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
+>receiver : Symbol(receiver, Decl(tslib.d.ts, --, --))
+>T : Symbol(T, Decl(tslib.d.ts, --, --))
+>state : Symbol(state, Decl(tslib.d.ts, --, --))
+>value : Symbol(value, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
+>V : Symbol(V, Decl(tslib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/privateNameStaticEmitHelpers.types b/tests/baselines/reference/privateNameStaticEmitHelpers.types
index bd4d15344e8e0..2cf321bb0a728 100644
--- a/tests/baselines/reference/privateNameStaticEmitHelpers.types
+++ b/tests/baselines/reference/privateNameStaticEmitHelpers.types
@@ -34,7 +34,7 @@ export class S {
 >  : ^^^^^^^^
 }
 
-=== node_modules/tslib/index.d.ts ===
+=== tslib.d.ts ===
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
 >__classPrivateFieldGet : <T extends object, V>(receiver: T, state: any) => V
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.errors.txt b/tests/baselines/reference/privatePropertyUsingObjectType.errors.txt
deleted file mode 100644
index 301401deeeded..0000000000000
--- a/tests/baselines/reference/privatePropertyUsingObjectType.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== privatePropertyUsingObjectType.ts (0 errors) ====
-    export class FilterManager {
-        private _filterProviders: { index: IFilterProvider; };
-        private _filterProviders2: { [index: number]: IFilterProvider; };
-        private _filterProviders3: { (index: number): IFilterProvider; };
-        private _filterProviders4: (index: number) => IFilterProvider;
-    }
-    export interface IFilterProvider {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/baseline/amd/baseline.errors.txt b/tests/baselines/reference/project/baseline/amd/baseline.errors.txt
deleted file mode 100644
index 7a2f702213bb1..0000000000000
--- a/tests/baselines/reference/project/baseline/amd/baseline.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export interface Point { x: number; y: number; };
-    export function point (x: number, y: number): Point {
-    	return { x: x, y: y };
-    }
-==== emit.ts (0 errors) ====
-    import g = require("./decl");
-    var p = g.point(10,20);
\ No newline at end of file
diff --git a/tests/baselines/reference/project/baseline/node/baseline.errors.txt b/tests/baselines/reference/project/baseline/node/baseline.errors.txt
deleted file mode 100644
index 30ec6e699721c..0000000000000
--- a/tests/baselines/reference/project/baseline/node/baseline.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export interface Point { x: number; y: number; };
-    export function point (x: number, y: number): Point {
-    	return { x: x, y: y };
-    }
-==== emit.ts (0 errors) ====
-    import g = require("./decl");
-    var p = g.point(10,20);
\ No newline at end of file
diff --git a/tests/baselines/reference/project/baseline2/amd/baseline2.errors.txt b/tests/baselines/reference/project/baseline2/amd/baseline2.errors.txt
deleted file mode 100644
index d515b287e96e1..0000000000000
--- a/tests/baselines/reference/project/baseline2/amd/baseline2.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export interface Point { x: number; y: number; };
-    export function point (x: number, y: number): Point {
-    	return { x: x, y: y };
-    }
-==== dont_emit.ts (0 errors) ====
-    import g = require("decl");
-    var p: g.Point = { x: 10, y: 20 };
\ No newline at end of file
diff --git a/tests/baselines/reference/project/baseline2/node/baseline2.errors.txt b/tests/baselines/reference/project/baseline2/node/baseline2.errors.txt
deleted file mode 100644
index 617a04f2151c7..0000000000000
--- a/tests/baselines/reference/project/baseline2/node/baseline2.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export interface Point { x: number; y: number; };
-    export function point (x: number, y: number): Point {
-    	return { x: x, y: y };
-    }
-==== dont_emit.ts (0 errors) ====
-    import g = require("decl");
-    var p: g.Point = { x: 10, y: 20 };
\ No newline at end of file
diff --git a/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt b/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
deleted file mode 100644
index 3590de718d749..0000000000000
--- a/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== nestedModule.ts (0 errors) ====
-    export namespace outer {
-    	export namespace inner {
-    		var local = 1;
-    		export var a = local;
-    	}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt b/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
deleted file mode 100644
index 3fa1f12ca1258..0000000000000
--- a/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== nestedModule.ts (0 errors) ====
-    export namespace outer {
-    	export namespace inner {
-    		var local = 1;
-    		export var a = local;
-    	}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
index b9d9e8b2b893e..09e738e27c13d 100644
--- a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
+++ b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
@@ -1,12 +1,8 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 decl.ts(1,26): error TS2792: Cannot find module './foo/bar.tx'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 decl.ts(2,26): error TS2792: Cannot find module 'baz'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 decl.ts(3,26): error TS2792: Cannot find module './baz'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== decl.ts (3 errors) ====
     import modErr  = require("./foo/bar.tx");
                              ~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
index 48a6b2a4975ba..09e738e27c13d 100644
--- a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
+++ b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 decl.ts(1,26): error TS2792: Cannot find module './foo/bar.tx'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 decl.ts(2,26): error TS2792: Cannot find module 'baz'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 decl.ts(3,26): error TS2792: Cannot find module './baz'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== decl.ts (3 errors) ====
     import modErr  = require("./foo/bar.tx");
                              ~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.errors.txt b/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.errors.txt
deleted file mode 100644
index cf15263948181..0000000000000
--- a/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    import mod = require("consume");
-    export function call() {
-    	mod.call();
-    }
-==== consume.ts (0 errors) ====
-    import mod = require("decl");
-    export function call() {
-    	mod.call();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/circularReferencing/node/circularReferencing.errors.txt b/tests/baselines/reference/project/circularReferencing/node/circularReferencing.errors.txt
deleted file mode 100644
index e6f259522ede2..0000000000000
--- a/tests/baselines/reference/project/circularReferencing/node/circularReferencing.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    import mod = require("consume");
-    export function call() {
-    	mod.call();
-    }
-==== consume.ts (0 errors) ====
-    import mod = require("decl");
-    export function call() {
-    	mod.call();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.errors.txt b/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.errors.txt
deleted file mode 100644
index d699f043eeab4..0000000000000
--- a/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    import A = require("a");
-     
-    export class B extends A.A { 
-        constructor () { 
-            super();
-        }
-    }
-==== c.ts (0 errors) ====
-    import B = require("b");
-     
-    export class C extends B.B { 
-        constructor () { 
-            super();
-        }
-    }
-    
-==== a.ts (0 errors) ====
-    import C = require("c");
-     
-    export class A {
-        constructor () { }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.errors.txt b/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.errors.txt
deleted file mode 100644
index cd945d1f622d7..0000000000000
--- a/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    import A = require("a");
-     
-    export class B extends A.A { 
-        constructor () { 
-            super();
-        }
-    }
-==== c.ts (0 errors) ====
-    import B = require("b");
-     
-    export class C extends B.B { 
-        constructor () { 
-            super();
-        }
-    }
-    
-==== a.ts (0 errors) ====
-    import C = require("c");
-     
-    export class A {
-        constructor () { }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarationDir.errors.txt b/tests/baselines/reference/project/declarationDir/amd/declarationDir.errors.txt
deleted file mode 100644
index 0d8c2778d28cf..0000000000000
--- a/tests/baselines/reference/project/declarationDir/amd/declarationDir.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    export class B {
-        
-    }
-==== a.ts (0 errors) ====
-    import {B} from './subfolder/b';
-    export class A {
-        b: B;
-    }
-==== subfolder/c.ts (0 errors) ====
-    import {A} from '../a';
-    
-    export class C {
-        a: A;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir/node/declarationDir.errors.txt b/tests/baselines/reference/project/declarationDir/node/declarationDir.errors.txt
deleted file mode 100644
index 7595d62dab7a2..0000000000000
--- a/tests/baselines/reference/project/declarationDir/node/declarationDir.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    export class B {
-        
-    }
-==== a.ts (0 errors) ====
-    import {B} from './subfolder/b';
-    export class A {
-        b: B;
-    }
-==== subfolder/c.ts (0 errors) ====
-    import {A} from '../a';
-    
-    export class C {
-        a: A;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.errors.txt b/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.errors.txt
deleted file mode 100644
index 0d8c2778d28cf..0000000000000
--- a/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    export class B {
-        
-    }
-==== a.ts (0 errors) ====
-    import {B} from './subfolder/b';
-    export class A {
-        b: B;
-    }
-==== subfolder/c.ts (0 errors) ====
-    import {A} from '../a';
-    
-    export class C {
-        a: A;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarationDir2.errors.txt b/tests/baselines/reference/project/declarationDir2/node/declarationDir2.errors.txt
deleted file mode 100644
index 7595d62dab7a2..0000000000000
--- a/tests/baselines/reference/project/declarationDir2/node/declarationDir2.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    export class B {
-        
-    }
-==== a.ts (0 errors) ====
-    import {B} from './subfolder/b';
-    export class A {
-        b: B;
-    }
-==== subfolder/c.ts (0 errors) ====
-    import {A} from '../a';
-    
-    export class C {
-        a: A;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
index fdd4900316bb9..4dfbd076cc92f 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
@@ -1,11 +1,7 @@
 error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== b.ts (0 errors) ====
     export class B {
         
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
index 5ed911b169808..c877782f38964 100644
--- a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
@@ -1,10 +1,8 @@
 error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
 !!! error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== b.ts (0 errors) ====
     export class B {
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.errors.txt b/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.errors.txt
deleted file mode 100644
index 5befa870d86ac..0000000000000
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== useModule.ts (0 errors) ====
-    declare module "quotedm1" {
-        import m4 = require("m4");
-        export class v {
-            public c: m4.d;
-        }
-    }
-    
-    declare module "quotedm2" {
-        import m1 = require("quotedm1");
-        export var c: m1.v;
-    }
-    
-    
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.errors.txt b/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.errors.txt
deleted file mode 100644
index a70585d1ef8fc..0000000000000
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== useModule.ts (0 errors) ====
-    declare module "quotedm1" {
-        import m4 = require("m4");
-        export class v {
-            public c: m4.d;
-        }
-    }
-    
-    declare module "quotedm2" {
-        import m1 = require("quotedm1");
-        export var c: m1.v;
-    }
-    
-    
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt b/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
deleted file mode 100644
index 833478d927747..0000000000000
--- a/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.d.ts (0 errors) ====
-    export interface A {
-        b: number;
-    }
-    export as namespace moduleA;
-==== useModule.ts (0 errors) ====
-    namespace moduleB {
-        export interface IUseModuleA {
-            a: moduleA.A;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt b/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
deleted file mode 100644
index f6e1a7f7645d0..0000000000000
--- a/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.d.ts (0 errors) ====
-    export interface A {
-        b: number;
-    }
-    export as namespace moduleA;
-==== useModule.ts (0 errors) ====
-    namespace moduleB {
-        export interface IUseModuleA {
-            a: moduleA.A;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.errors.txt b/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.errors.txt
deleted file mode 100644
index 71f7e801d987e..0000000000000
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== glo_m4.ts (0 errors) ====
-    
-    export class d {
-    };
-    export var x: d;
-    export function foo(): d {
-        return new d();
-    }
-    
-    
-==== useModule.ts (0 errors) ====
-    import glo_m4 = require("glo_m4");
-    export var useGlo_m4_x4 = glo_m4.x;
-    export var useGlo_m4_d4 = glo_m4.d;
-    export var useGlo_m4_f4 = glo_m4.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.errors.txt b/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.errors.txt
deleted file mode 100644
index 70efa77735aab..0000000000000
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== glo_m4.ts (0 errors) ====
-    
-    export class d {
-    };
-    export var x: d;
-    export function foo(): d {
-        return new d();
-    }
-    
-    
-==== useModule.ts (0 errors) ====
-    import glo_m4 = require("glo_m4");
-    export var useGlo_m4_x4 = glo_m4.x;
-    export var useGlo_m4_d4 = glo_m4.d;
-    export var useGlo_m4_f4 = glo_m4.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
deleted file mode 100644
index 5a2867d36b6fe..0000000000000
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== private_m4.ts (0 errors) ====
-    
-    export class d {
-    };
-    export var x: d;
-    export function foo(): d {
-        return new d();
-    }
-    
-    
-==== useModule.ts (0 errors) ====
-    // only used privately no need to emit
-    import private_m4 = require("private_m4");
-    export namespace usePrivate_m4_m1 {
-        var x3 = private_m4.x;
-        var d3 = private_m4.d;
-        var f3 = private_m4.foo();
-    
-        export var numberVar: number;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
deleted file mode 100644
index 1cab1c03a3e64..0000000000000
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== private_m4.ts (0 errors) ====
-    
-    export class d {
-    };
-    export var x: d;
-    export function foo(): d {
-        return new d();
-    }
-    
-    
-==== useModule.ts (0 errors) ====
-    // only used privately no need to emit
-    import private_m4 = require("private_m4");
-    export namespace usePrivate_m4_m1 {
-        var x3 = private_m4.x;
-        var d3 = private_m4.d;
-        var f3 = private_m4.foo();
-    
-        export var numberVar: number;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.errors.txt b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.errors.txt
deleted file mode 100644
index 9c0dcb6ab676b..0000000000000
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== fncOnly_m4.ts (0 errors) ====
-    
-    export class d {
-    };
-    export var x: d;
-    export function foo(): d {
-        return new d();
-    }
-    
-    
-==== useModule.ts (0 errors) ====
-    import fncOnly_m4 = require("fncOnly_m4");
-    export var useFncOnly_m4_f4 = fncOnly_m4.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.errors.txt b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.errors.txt
deleted file mode 100644
index 800a0933dc5c8..0000000000000
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== fncOnly_m4.ts (0 errors) ====
-    
-    export class d {
-    };
-    export var x: d;
-    export function foo(): d {
-        return new d();
-    }
-    
-    
-==== useModule.ts (0 errors) ====
-    import fncOnly_m4 = require("fncOnly_m4");
-    export var useFncOnly_m4_f4 = fncOnly_m4.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.errors.txt b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.errors.txt
deleted file mode 100644
index f2d98e4b42baa..0000000000000
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== m5.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export function foo2() {
-        return new m4.d();
-    }
-==== useModule.ts (0 errors) ====
-    // Do not emit unused import
-    import m5 = require("m5");
-    export var d = m5.foo2();
-    export var x = m5.foo2;
-    
-    export function n() {
-        return m5.foo2();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.errors.txt b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.errors.txt
deleted file mode 100644
index 2eb82cb61b2e5..0000000000000
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== m5.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export function foo2() {
-        return new m4.d();
-    }
-==== useModule.ts (0 errors) ====
-    // Do not emit unused import
-    import m5 = require("m5");
-    export var d = m5.foo2();
-    export var x = m5.foo2;
-    
-    export function n() {
-        return m5.foo2();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
deleted file mode 100644
index 2e320cff19d44..0000000000000
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== useModule.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export namespace m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
-    
-    // Do not emit multiple used import statements
-    import multiImport_m4 = require("m4"); // Emit used
-    export var useMultiImport_m4_x4 = multiImport_m4.x;
-    export var useMultiImport_m4_d4 = multiImport_m4.d;
-    export var useMultiImport_m4_f4 = multiImport_m4.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
deleted file mode 100644
index adbf74ce77c1f..0000000000000
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== useModule.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export namespace m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
-    
-    // Do not emit multiple used import statements
-    import multiImport_m4 = require("m4"); // Emit used
-    export var useMultiImport_m4_x4 = multiImport_m4.x;
-    export var useMultiImport_m4_d4 = multiImport_m4.d;
-    export var useMultiImport_m4_f4 = multiImport_m4.foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
deleted file mode 100644
index f1d13f19b4505..0000000000000
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== m5.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export function foo2() {
-        return new m4.d();
-    }
-==== useModule.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export namespace m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
-    
-    // Do not emit unused import
-    import m5 = require("m5");
-    export var d = m5.foo2();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
deleted file mode 100644
index 9fd68a4c43ccf..0000000000000
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== m5.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export function foo2() {
-        return new m4.d();
-    }
-==== useModule.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export namespace m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
-    
-    // Do not emit unused import
-    import m5 = require("m5");
-    export var d = m5.foo2();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
deleted file mode 100644
index 1d0efa7d14624..0000000000000
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== useModule.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export namespace m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
deleted file mode 100644
index d32645887060c..0000000000000
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m4.ts (0 errors) ====
-    export class d {
-    };
-    export var x: d;
-    export function foo() {
-        return new d();
-    }
-    
-==== useModule.ts (0 errors) ====
-    import m4 = require("m4"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export namespace m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.errors.txt b/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.errors.txt
deleted file mode 100644
index 1ca880ef898ef..0000000000000
--- a/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref.d.ts (0 errors) ====
-    declare module M1
-    {
-        export function f1(): void;
-    }
-==== consumer.ts (0 errors) ====
-    ///<reference path="ref.d.ts" />
-    
-    // in the generated code a 'this' is added before this call
-    M1.f1();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.errors.txt b/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.errors.txt
deleted file mode 100644
index cec554c516db9..0000000000000
--- a/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref.d.ts (0 errors) ====
-    declare module M1
-    {
-        export function f1(): void;
-    }
-==== consumer.ts (0 errors) ====
-    ///<reference path="ref.d.ts" />
-    
-    // in the generated code a 'this' is added before this call
-    M1.f1();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
index b1f81b629f7d4..73d3a86d014bc 100644
--- a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
+++ b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
@@ -1,11 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 in1.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
 in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== decl.d.ts (0 errors) ====
     // bug 535531: duplicate identifier error reported for "import" declarations in separate files
     
diff --git a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
index a2584e6b97c29..73d3a86d014bc 100644
--- a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
+++ b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 in1.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
 in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== decl.d.ts (0 errors) ====
     // bug 535531: duplicate identifier error reported for "import" declarations in separate files
     
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.errors.txt
deleted file mode 100644
index 1a9ede8c45089..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "declaration": true
-        }
-    }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.errors.txt
deleted file mode 100644
index c152eb847a1e5..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "declaration": true
-        }
-    }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
deleted file mode 100644
index 0994c19e96f40..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "allowJs": true
-        }
-    }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/node/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/node/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
deleted file mode 100644
index 89f9957c19347..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/node/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "allowJs": true
-        }
-    }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/amd/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/amd/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
deleted file mode 100644
index c17623171c4b4..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/amd/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "declaration": true
-        }
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/node/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/node/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
deleted file mode 100644
index b8ef2bd450e25..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/node/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "declaration": true
-        }
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
deleted file mode 100644
index 33138ca2028ff..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "allowJs": true
-        }
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/node/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/node/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
deleted file mode 100644
index 6fae14f105e6b..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/node/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "allowJs": true
-        }
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.errors.txt b/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.errors.txt
deleted file mode 100644
index ef94fccaf8f8b..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "target": "es5"
-        }
-    }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.errors.txt b/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.errors.txt
deleted file mode 100644
index 593927f1e7d0e..0000000000000
--- a/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "target": "es5"
-        }
-    }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
index 06a7bb238c97a..e645d251235a1 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
@@ -1,18 +1,12 @@
-tsconfig.json(3,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(5,15): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (2 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "target": "es5",
         "module": "commonjs",
-                  ~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "isolatedModules": true
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index 5da35ebf93899..9ca20dffe6e8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -1,42 +1,9 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -44,7 +11,6 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
-    ng = __importStar(ng);
     var MyClass1 = /** @class */ (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
index 9ced49cce9130..e645d251235a1 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
@@ -1,13 +1,10 @@
-tsconfig.json(3,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "target": "es5",
         "module": "commonjs",
         "emitDecoratorMetadata": true,
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index bba021d7074c6..7a668087a0301 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass1 = void 0;
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
index 762e07cf1d37d..4362efe8f139e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
@@ -1,18 +1,12 @@
-tsconfig.json(3,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(5,15): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (2 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "target": "es5",
         "module": "commonjs",
-                  ~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "isolatedModules": true,
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index 5da35ebf93899..9ca20dffe6e8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -1,42 +1,9 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -44,7 +11,6 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
-    ng = __importStar(ng);
     var MyClass1 = /** @class */ (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
index 4f2e4137d9955..4362efe8f139e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
@@ -1,13 +1,10 @@
-tsconfig.json(3,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "target": "es5",
         "module": "commonjs",
         "emitDecoratorMetadata": true,
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index bba021d7074c6..7a668087a0301 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass1 = void 0;
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
index 4c3cba22b2566..b8ae506a1ffa4 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
@@ -1,18 +1,12 @@
-tsconfig.json(3,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(5,15): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (2 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "target": "es5",
         "module": "system",
-                  ~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true
       },
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index 5da35ebf93899..9ca20dffe6e8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -1,42 +1,9 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -44,7 +11,6 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
-    ng = __importStar(ng);
     var MyClass1 = /** @class */ (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
index 1e19b3cfa4c97..b8ae506a1ffa4 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
@@ -1,13 +1,10 @@
-tsconfig.json(3,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "target": "es5",
         "module": "system",
         "emitDecoratorMetadata": true,
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index bba021d7074c6..7a668087a0301 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass1 = void 0;
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
index cb44c70831178..05181175f9372 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
@@ -1,19 +1,13 @@
-tsconfig.json(5,15): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(6,25): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (2 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
         "target": "es5",
         "module": "system",
-                  ~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "moduleResolution": "node",
-                            ~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "isolatedModules": true
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index 5da35ebf93899..9ca20dffe6e8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -1,42 +1,9 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -44,7 +11,6 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
-    ng = __importStar(ng);
     var MyClass1 = /** @class */ (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
index f2f6708ec1f3e..05181175f9372 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
@@ -1,16 +1,13 @@
-tsconfig.json(6,25): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
         "target": "es5",
         "module": "system",
         "moduleResolution": "node",
-                            ~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "isolatedModules": true
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index bba021d7074c6..7a668087a0301 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass1 = void 0;
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
index 4dd71c2480382..555f6f1a7ccb6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
@@ -1,19 +1,13 @@
-tsconfig.json(5,15): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(6,25): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (2 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
         "target": "es5",
         "module": "system",
-                  ~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "moduleResolution": "node",
-                            ~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "isolatedModules": true,
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index 5da35ebf93899..9ca20dffe6e8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -1,42 +1,9 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -44,7 +11,6 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
-    ng = __importStar(ng);
     var MyClass1 = /** @class */ (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
index 6f129bfd68837..555f6f1a7ccb6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
@@ -1,16 +1,13 @@
-tsconfig.json(6,25): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,21): error TS2792: Cannot find module 'angular2/core'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (0 errors) ====
     {
       "compileOnSave": true,
       "compilerOptions": {
         "target": "es5",
         "module": "system",
         "moduleResolution": "node",
-                            ~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "isolatedModules": true,
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index bba021d7074c6..7a668087a0301 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass1 = void 0;
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
deleted file mode 100644
index e386dc0900383..0000000000000
--- a/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internal.ts (0 errors) ====
-    namespace outer {
-    	export var b = "foo";
-    }
-==== external2.ts (0 errors) ====
-    export function square(x: number) {
-    	return (x * x);
-    }
-==== external.ts (0 errors) ====
-    ///<reference path="internal.ts" />
-    import a = require("external2");
-    
-    outer.b = "bar";
-    var c = a.square(5);
\ No newline at end of file
diff --git a/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
deleted file mode 100644
index dcef28814220e..0000000000000
--- a/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== internal.ts (0 errors) ====
-    namespace outer {
-    	export var b = "foo";
-    }
-==== external2.ts (0 errors) ====
-    export function square(x: number) {
-    	return (x * x);
-    }
-==== external.ts (0 errors) ====
-    ///<reference path="internal.ts" />
-    import a = require("external2");
-    
-    outer.b = "bar";
-    var c = a.square(5);
\ No newline at end of file
diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
index c9b00e285d34f..4d0524e49b483 100644
--- a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
@@ -1,11 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 internal2.ts(2,21): error TS1147: Import declarations in a namespace cannot reference a module.
 internal2.ts(2,21): error TS2792: Cannot find module 'external2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== internal2.ts (2 errors) ====
     namespace outer {
     	import g = require("external2")
diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
index 2141f273cc9cc..4d0524e49b483 100644
--- a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 internal2.ts(2,21): error TS1147: Import declarations in a namespace cannot reference a module.
 internal2.ts(2,21): error TS2792: Cannot find module 'external2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== internal2.ts (2 errors) ====
     namespace outer {
     	import g = require("external2")
diff --git a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt
index d45c4c02594e3..ce9c2a81f90ee 100644
--- a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt
+++ b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt
@@ -1,5 +1,3 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6053: File 'a.ts' not found.
   The file is in the program because:
     Root file specified for compilation
@@ -11,8 +9,6 @@ error TS6231: Could not resolve the path 'a' with the extensions: '.ts', '.tsx',
     Root file specified for compilation
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6053: File 'a.ts' not found.
 !!! error TS6053:   The file is in the program because:
 !!! error TS6053:     Root file specified for compilation
diff --git a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt
index 4fcba270f6d00..ce9c2a81f90ee 100644
--- a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt
+++ b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6053: File 'a.ts' not found.
   The file is in the program because:
     Root file specified for compilation
@@ -10,7 +9,6 @@ error TS6231: Could not resolve the path 'a' with the extensions: '.ts', '.tsx',
     Root file specified for compilation
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6053: File 'a.ts' not found.
 !!! error TS6053:   The file is in the program because:
 !!! error TS6053:     Root file specified for compilation
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
deleted file mode 100644
index 3d0b1a53d87a5..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-DifferentNamesNotSpecified/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-DifferentNamesNotSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== DifferentNamesNotSpecified/tsconfig.json (2 errors) ====
-    {
-      "compilerOptions": { "outFile": "test.js" }
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-    }
-    
-==== DifferentNamesNotSpecified/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
index 7ecee4af6d6cc..94920694c0774 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
@@ -1,12 +1,9 @@
-DifferentNamesNotSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesNotSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesNotSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecified/tsconfig.json (1 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" }
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
                            ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
     }
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index b40a4ad1bab39..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
-    {
-      "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        "outFile": "test.js",
-        "allowJs": true
-      }
-    }
-    
-==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
-==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ====
-    var test2 = 10; // Should get compiled
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
index 454843c1b1547..f6601905979af 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
@@ -1,12 +1,9 @@
-DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
     {
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "outFile": "test.js",
         ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
index e1eb0c3dc70ae..bc59a1a6546c5 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -1,21 +1,15 @@
 error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
   The file is in the program because:
     Part of 'files' list in tsconfig.json
-DifferentNamesSpecified/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-DifferentNamesSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Part of 'files' list in tsconfig.json
 !!! related TS1410 DifferentNamesSpecified/tsconfig.json:3:22: File is matched by 'files' list specified here.
-==== DifferentNamesSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (0 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" },
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
       "files": [ "a.ts", "b.js" ]
     }
     
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
index 29b42d19cdc69..2a527c77f34d7 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -1,7 +1,6 @@
 error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
   The file is in the program because:
     Part of 'files' list in tsconfig.json
-DifferentNamesSpecified/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
@@ -9,11 +8,9 @@ DifferentNamesSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'syste
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Part of 'files' list in tsconfig.json
 !!! related TS1410 DifferentNamesSpecified/tsconfig.json:3:22: File is matched by 'files' list specified here.
-==== DifferentNamesSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (1 errors) ====
     {
       "compilerOptions": { "outFile": "test.js" },
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
                            ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
       "files": [ "a.ts", "b.js" ]
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index 53ba08a0e8fbb..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
-    {
-      "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        "outFile": "test.js",
-        "allowJs": true
-      },
-      "files": [ "a.ts", "b.js" ]
-    }
-    
-==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
-==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ====
-    var test2 = 10; // Should get compiled
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
index a6a84514ee0a7..5e9b61c196d63 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
@@ -1,12 +1,9 @@
-DifferentNamesSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
     {
       "compilerOptions": {
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "outFile": "test.js",
         ~~~~~~~~~
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.errors.txt
deleted file mode 100644
index 8f432f9a92f8c..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameDTsSpecified/tsconfig.json (0 errors) ====
-    { "files": [ "a.d.ts" ] }
-==== SameNameDTsSpecified/a.d.ts (0 errors) ====
-    declare var test: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.errors.txt
deleted file mode 100644
index aeda30adafc6e..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameDTsSpecified/tsconfig.json (0 errors) ====
-    { "files": [ "a.d.ts" ] }
-==== SameNameDTsSpecified/a.d.ts (0 errors) ====
-    declare var test: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index fda0dddeff21a..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-SameNameDTsSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-SameNameDTsSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== SameNameDTsSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
-    {
-      "compilerOptions": { "allowJs": true },
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      "files": [ "a.d.ts" ]
-    }
-==== SameNameDTsSpecifiedWithAllowJs/a.d.ts (0 errors) ====
-    declare var test: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index 8214bf14d39d6..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-SameNameDTsSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== SameNameDTsSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
-    {
-      "compilerOptions": { "allowJs": true },
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      "files": [ "a.d.ts" ]
-    }
-==== SameNameDTsSpecifiedWithAllowJs/a.d.ts (0 errors) ====
-    declare var test: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.errors.txt
deleted file mode 100644
index 7bab7566c8c99..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameDTsNotSpecified/tsconfig.json (0 errors) ====
-    
-==== SameNameDTsNotSpecified/a.d.ts (0 errors) ====
-    declare var a: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.errors.txt
deleted file mode 100644
index f373c7d74c8d6..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameDTsNotSpecified/tsconfig.json (0 errors) ====
-    
-==== SameNameDTsNotSpecified/a.d.ts (0 errors) ====
-    declare var a: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
index b704a662fe3b1..45cdfd7a3bc42 100644
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
@@ -2,20 +2,14 @@ error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.d.ts' beca
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
 error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.d.ts' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
 !!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-==== SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json (0 errors) ====
     { "compilerOptions": { "allowJs": true } }
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ====
     declare var a: number;
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
index 03de92d63f76d..45cdfd7a3bc42 100644
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
@@ -2,17 +2,14 @@ error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.d.ts' beca
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
 error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.d.ts' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
 !!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-==== SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
+==== SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json (0 errors) ====
     { "compilerOptions": { "allowJs": true } }
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ====
     declare var a: number;
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.errors.txt
deleted file mode 100644
index 4633efa5dfbc8..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameFilesNotSpecified/tsconfig.json (0 errors) ====
-    
-==== SameNameFilesNotSpecified/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.errors.txt
deleted file mode 100644
index 2b9b7a6b064be..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameFilesNotSpecified/tsconfig.json (0 errors) ====
-    
-==== SameNameFilesNotSpecified/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index a928effffd57f..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
-    { "compilerOptions": { "allowJs": true } }
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameFilesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index f8bb575be7262..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== SameNameFilesNotSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
-    { "compilerOptions": { "allowJs": true } }
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameFilesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.errors.txt
deleted file mode 100644
index 0ab587e1d0ca7..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameTsSpecified/tsconfig.json (0 errors) ====
-    { "files": [ "a.ts" ] }
-==== SameNameTsSpecified/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.errors.txt
deleted file mode 100644
index 0a3ac10ee871a..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== SameNameTsSpecified/tsconfig.json (0 errors) ====
-    { "files": [ "a.ts" ] }
-==== SameNameTsSpecified/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index d2ed3a4f3643c..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-SameNameTsSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-SameNameTsSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== SameNameTsSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
-    {
-      "compilerOptions": { "allowJs": true },
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      "files": [ "a.ts" ]
-    }
-==== SameNameTsSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index 8c3a5814cb324..0000000000000
--- a/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-SameNameTsSpecifiedWithAllowJs/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== SameNameTsSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
-    {
-      "compilerOptions": { "allowJs": true },
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      "files": [ "a.ts" ]
-    }
-==== SameNameTsSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
index e7cb96db65bd7..aa02b659d5de9 100644
--- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
@@ -1,13 +1,9 @@
 error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
 error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
 !!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
index 31632130645cc..aa02b659d5de9 100644
--- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
@@ -1,11 +1,9 @@
 error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
 error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
 !!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
index 4452a4cd37a11..7ad42e1a26d37 100644
--- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
@@ -1,11 +1,7 @@
 error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
index d38d2c2f6b490..7ad42e1a26d37 100644
--- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
@@ -1,9 +1,7 @@
 error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5069: Option 'mapRoot' cannot be specified without specifying option 'sourceMap' or option 'declarationMap'.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.errors.txt b/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.errors.txt
deleted file mode 100644
index 8bda4388decac..0000000000000
--- a/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export interface P { x: number; y: number; }
-    export var a = 1;
-==== consume.ts (0 errors) ====
-    import M = require("./decl");
-    
-    var p : M.P;
-    var x1 = M.a;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.errors.txt b/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.errors.txt
deleted file mode 100644
index 11eea719c5f2a..0000000000000
--- a/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export interface P { x: number; y: number; }
-    export var a = 1;
-==== consume.ts (0 errors) ====
-    import M = require("./decl");
-    
-    var p : M.P;
-    var x1 = M.a;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt b/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
deleted file mode 100644
index d6da6659accad..0000000000000
--- a/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    namespace Test {
-        class A {
-            one: string;
-            two: boolean;
-            constructor (t: string) {
-                this.one = t;
-                this.two = false;
-            }
-        }
-        export class B {
-            private member: A[];
-    
-            constructor () {
-                this.member = [];
-            }
-        }
-    }
-    
-==== b.ts (0 errors) ====
-    namespace Test {}
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt b/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
deleted file mode 100644
index b25a7ac2aa141..0000000000000
--- a/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (0 errors) ====
-    namespace Test {
-        class A {
-            one: string;
-            two: boolean;
-            constructor (t: string) {
-                this.one = t;
-                this.two = false;
-            }
-        }
-        export class B {
-            private member: A[];
-    
-            constructor () {
-                this.member = [];
-            }
-        }
-    }
-    
-==== b.ts (0 errors) ====
-    namespace Test {}
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt b/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
deleted file mode 100644
index 31066548247b1..0000000000000
--- a/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    namespace Test {}
-    
-    
-==== a.ts (0 errors) ====
-    namespace Test {
-        class A {
-            one: string;
-            two: boolean;
-            constructor (t: string) {
-                this.one = t;
-                this.two = false;
-            }
-        }
-        export class B {
-            private member: A[];
-    
-            constructor () {
-                this.member = [];
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt b/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
deleted file mode 100644
index 574a78301e6fa..0000000000000
--- a/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    namespace Test {}
-    
-    
-==== a.ts (0 errors) ====
-    namespace Test {
-        class A {
-            one: string;
-            two: boolean;
-            constructor (t: string) {
-                this.one = t;
-                this.two = false;
-            }
-        }
-        export class B {
-            private member: A[];
-    
-            constructor () {
-                this.member = [];
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.errors.txt b/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.errors.txt
deleted file mode 100644
index dd5fe29148fd6..0000000000000
--- a/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.errors.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== A.ts (0 errors) ====
-    export class A
-    {
-        public A(): string{ return "hello from A"; }
-    }
-    
-==== AA.ts (0 errors) ====
-    export class AA
-    {
-        public A(): string{ return "hello from AA"; }
-    }
-    
-==== B.ts (0 errors) ====
-    import A = require("../A/A");
-    import AA = require("../A/AA/AA");
-    
-    export class B
-    {
-        public Create(): IA
-        {
-            return new A.A();
-        }
-    }
-    
-    export interface IA
-    {
-        A(): string;
-    }
-    
-==== root.ts (0 errors) ====
-    //import A = require("./A/A");
-    import B = require("B/B");
-    
-    var a = (new B.B()).Create();
-    
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.errors.txt b/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.errors.txt
deleted file mode 100644
index 7070e3a8d8655..0000000000000
--- a/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== A.ts (0 errors) ====
-    export class A
-    {
-        public A(): string{ return "hello from A"; }
-    }
-    
-==== AA.ts (0 errors) ====
-    export class AA
-    {
-        public A(): string{ return "hello from AA"; }
-    }
-    
-==== B.ts (0 errors) ====
-    import A = require("../A/A");
-    import AA = require("../A/AA/AA");
-    
-    export class B
-    {
-        public Create(): IA
-        {
-            return new A.A();
-        }
-    }
-    
-    export interface IA
-    {
-        A(): string;
-    }
-    
-==== root.ts (0 errors) ====
-    //import A = require("./A/A");
-    import B = require("B/B");
-    
-    var a = (new B.B()).Create();
-    
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.errors.txt b/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.errors.txt
deleted file mode 100644
index 43c30f6649690..0000000000000
--- a/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== consume.ts (0 errors) ====
-    declare module "math" 
-    {
-        import blah = require("blah");
-        export function baz();
-    }
-    
-    declare module "blah"
-    {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.errors.txt b/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.errors.txt
deleted file mode 100644
index 11092cea6c360..0000000000000
--- a/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== consume.ts (0 errors) ====
-    declare module "math" 
-    {
-        import blah = require("blah");
-        export function baz();
-    }
-    
-    declare module "blah"
-    {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
index d6c6e4048d3b4..55588f39d5425 100644
--- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
@@ -1,10 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test1.ts(2,23): error TS1147: Import declarations in a namespace cannot reference a module.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test1.ts (1 errors) ====
     export namespace myModule {
      import foo = require("test2");
diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
index 461ab4646c228..55588f39d5425 100644
--- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test1.ts(2,23): error TS1147: Import declarations in a namespace cannot reference a module.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test1.ts (1 errors) ====
     export namespace myModule {
      import foo = require("test2");
diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
index 22bdd7c7c1273..82636696b5dfe 100644
--- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
@@ -1,11 +1,7 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test1.ts(3,23): error TS1147: Import declarations in a namespace cannot reference a module.
 test1.ts(3,23): error TS2792: Cannot find module 'test2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test1.ts (2 errors) ====
     namespace myModule {
      
diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
index eb43a5136b922..82636696b5dfe 100644
--- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test1.ts(3,23): error TS1147: Import declarations in a namespace cannot reference a module.
 test1.ts(3,23): error TS2792: Cannot find module 'test2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test1.ts (2 errors) ====
     namespace myModule {
      
diff --git a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
deleted file mode 100644
index 9699825d7f176..0000000000000
--- a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== lib/classA.ts (0 errors) ====
-    namespace test {
-        export class ClassA
-        {
-            public method() { }
-        }
-    }
-==== lib/classB.ts (0 errors) ====
-    /// <reference path="classA.ts" />
-    
-    namespace test {
-        export class ClassB extends ClassA 
-        {
-        }
-    }
-==== main.ts (0 errors) ====
-    /// <reference path="lib/classA.ts" />
-    /// <reference path="lib/classB.ts" />
-    
-    class ClassC extends test.ClassA {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt b/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
deleted file mode 100644
index 19feb3cc3e42b..0000000000000
--- a/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== lib/classA.ts (0 errors) ====
-    namespace test {
-        export class ClassA
-        {
-            public method() { }
-        }
-    }
-==== lib/classB.ts (0 errors) ====
-    /// <reference path="classA.ts" />
-    
-    namespace test {
-        export class ClassB extends ClassA 
-        {
-        }
-    }
-==== main.ts (0 errors) ====
-    /// <reference path="lib/classA.ts" />
-    /// <reference path="lib/classB.ts" />
-    
-    class ClassC extends test.ClassA {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.errors.txt b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.errors.txt
deleted file mode 100644
index 1e2d30f4ad32a..0000000000000
--- a/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== tsconfig.json (0 errors) ====
-    { "files": [ "a.ts" ] }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.errors.txt b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.errors.txt
deleted file mode 100644
index 852e30746ec44..0000000000000
--- a/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== tsconfig.json (0 errors) ====
-    { "files": [ "a.ts" ] }
-==== a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index ebc5f7e045980..15d7b1dd43044 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -1,40 +1,6 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    m1 = __importStar(m1);
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
index d28c30fc98b5d..15ab81a78c641 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -1,14 +1,11 @@
-importHigher/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 importHigher/tsconfig.json(5,25): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== importHigher/tsconfig.json (2 errors) ====
+==== importHigher/tsconfig.json (1 errors) ====
     {
       "compilerOptions": { 
-      ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "allowJs": true,
         "declaration": false,
         "moduleResolution": "node",
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index f1fb849ef6505..ae48958106a95 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -1,39 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1 = __importStar(require("m1"));
+var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
index e88822635f091..dd162fc2f89f2 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -1,40 +1,6 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    m1 = __importStar(m1);
     m1.f1("test");
     m1.f2.a = "10"; // Error: Should be number
     m1.rel = 42; // Error: Should be boolean
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
index 036cc2483f702..4a8a36a59473f 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,16 +1,13 @@
-maxDepthExceeded/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 maxDepthExceeded/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
 maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it is a read-only property.
 
 
-==== maxDepthExceeded/tsconfig.json (2 errors) ====
+==== maxDepthExceeded/tsconfig.json (1 errors) ====
     {
       "compilerOptions": { 
       ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107:   Visit https://aka.ms/ts6 for migration information.
         "allowJs": true,
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index 016735824e83a..9597d626ed7c2 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -1,39 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1 = __importStar(require("m1"));
+var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = "10"; // Error: Should be number
 m1.rel = 42; // Error: Should be boolean
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
index 6fba760db90ef..0cc4ffe817ce8 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -1,41 +1,6 @@
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    m1 = __importStar(m1);
-    m4 = __importStar(m4);
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
index 46150dd416ccf..00f98e5a0fbbc 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,15 +1,12 @@
-maxDepthIncreased/tsconfig.json(2,3): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 maxDepthIncreased/tsconfig.json(2,3): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 maxDepthIncreased/root.ts(7,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== maxDepthIncreased/tsconfig.json (2 errors) ====
+==== maxDepthIncreased/tsconfig.json (1 errors) ====
     {
       "compilerOptions": { 
       ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-      ~~~~~~~~~~~~~~~~~
 !!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107:   Visit https://aka.ms/ts6 for migration information.
         "allowJs": true,
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index 12c1266cceb25..5c69ac5bc9250 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -1,40 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1 = __importStar(require("m1"));
-var m4 = __importStar(require("m4"));
+var m1 = require("m1");
+var m4 = require("m4");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
diff --git a/tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt b/tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt
deleted file mode 100644
index ac559b316d169..0000000000000
--- a/tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export function call() {
-        return "success";    
-    }
-==== b.ts (0 errors) ====
-    export function hello() { }
-    
-==== a.ts (0 errors) ====
-    import b = require("lib/foo/b");
-    export function hello() { }
-    
-==== a.ts (0 errors) ====
-    export function hello() { }
-    
-==== consume.ts (0 errors) ====
-    import mod = require("decl");
-    import x = require("lib/foo/a");
-    import y = require("lib/bar/a");
-    
-    x.hello();
-    y.hello();
-    
-    var str = mod.call();
-    
-    
-    declare function fail();
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nonRelative/node/nonRelative.errors.txt b/tests/baselines/reference/project/nonRelative/node/nonRelative.errors.txt
deleted file mode 100644
index ddb0b1a767bab..0000000000000
--- a/tests/baselines/reference/project/nonRelative/node/nonRelative.errors.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export function call() {
-        return "success";    
-    }
-==== b.ts (0 errors) ====
-    export function hello() { }
-    
-==== a.ts (0 errors) ====
-    import b = require("lib/foo/b");
-    export function hello() { }
-    
-==== a.ts (0 errors) ====
-    export function hello() { }
-    
-==== consume.ts (0 errors) ====
-    import mod = require("decl");
-    import x = require("lib/foo/a");
-    import y = require("lib/bar/a");
-    
-    x.hello();
-    y.hello();
-    
-    var str = mod.call();
-    
-    
-    declare function fail();
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
index 3518e3dd59d30..0ca4f7ce17672 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
@@ -1,13 +1,9 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 testGlo.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
 testGlo.ts(2,39): error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 testGlo.ts(21,35): error TS1147: Import declarations in a namespace cannot reference a module.
 testGlo.ts(21,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== testGlo.ts (4 errors) ====
     namespace m2 {
         export import mExported = require("mExported");
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
index b05de9e6a31a3..0ca4f7ce17672 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 testGlo.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
 testGlo.ts(2,39): error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 testGlo.ts(21,35): error TS1147: Import declarations in a namespace cannot reference a module.
 testGlo.ts(21,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== testGlo.ts (4 errors) ====
     namespace m2 {
         export import mExported = require("mExported");
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
index 63c8847b9aa3e..c3458f201e26d 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
@@ -1,13 +1,9 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test.ts(5,39): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(5,39): error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 test.ts(24,35): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(24,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (4 errors) ====
     export namespace m1 {
     }
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
index cae3389af4f33..c3458f201e26d 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test.ts(5,39): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(5,39): error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 test.ts(24,35): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(24,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (4 errors) ====
     export namespace m1 {
     }
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
index be421859a8ffd..30d923b82171b 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
@@ -1,13 +1,9 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(2,39): error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 test.ts(42,35): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (4 errors) ====
     export namespace m2 {
         export import mExported = require("mExported");
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
index 136705639f89a..30d923b82171b 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
@@ -1,11 +1,9 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(2,39): error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 test.ts(42,35): error TS1147: Import declarations in a namespace cannot reference a module.
 test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (4 errors) ====
     export namespace m2 {
         export import mExported = require("mExported");
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
deleted file mode 100644
index acf505d4d9ce9..0000000000000
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== mExported.ts (0 errors) ====
-    export namespace me {
-        export class class1 {
-            public prop1 = 0;
-        }
-    
-        export var x = class1;
-        export function foo() {
-            return new class1();
-        }
-    }
-==== mNonExported.ts (0 errors) ====
-    export namespace mne {
-        export class class1 {
-            public prop1 = 0;
-        }
-    
-        export var x = class1;
-        export function foo() {
-            return new class1();
-        }
-    }
-==== test.ts (0 errors) ====
-    export import mExported = require("mExported");
-    export var c1 = new mExported.me.class1;
-    export function f1() {
-        return new mExported.me.class1();
-    }
-    export var x1 = mExported.me.x;
-    
-    export class class1 extends mExported.me.class1 {
-    }
-    
-    var c2 = new mExported.me.class1;
-    function f2() {
-        return new mExported.me.class1();
-    }
-    var x2 = mExported.me.x;
-    
-    class class2 extends mExported.me.class1 {
-    }
-    
-    import mNonExported = require("mNonExported");
-    export var c3 = new mNonExported.mne.class1;
-    export function f3() {
-        return new mNonExported.mne.class1();
-    }
-    export var x3 = mNonExported.mne.x;
-    
-    export class class3 extends mNonExported.mne.class1 {
-    }
-    
-    var c4 = new mNonExported.mne.class1;
-    function f4() {
-        return new mNonExported.mne.class1();
-    }
-    var x4 = mNonExported.mne.x;
-    
-    class class4 extends mNonExported.mne.class1 {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
deleted file mode 100644
index 9bd26355c3d90..0000000000000
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== mExported.ts (0 errors) ====
-    export namespace me {
-        export class class1 {
-            public prop1 = 0;
-        }
-    
-        export var x = class1;
-        export function foo() {
-            return new class1();
-        }
-    }
-==== mNonExported.ts (0 errors) ====
-    export namespace mne {
-        export class class1 {
-            public prop1 = 0;
-        }
-    
-        export var x = class1;
-        export function foo() {
-            return new class1();
-        }
-    }
-==== test.ts (0 errors) ====
-    export import mExported = require("mExported");
-    export var c1 = new mExported.me.class1;
-    export function f1() {
-        return new mExported.me.class1();
-    }
-    export var x1 = mExported.me.x;
-    
-    export class class1 extends mExported.me.class1 {
-    }
-    
-    var c2 = new mExported.me.class1;
-    function f2() {
-        return new mExported.me.class1();
-    }
-    var x2 = mExported.me.x;
-    
-    class class2 extends mExported.me.class1 {
-    }
-    
-    import mNonExported = require("mNonExported");
-    export var c3 = new mNonExported.mne.class1;
-    export function f3() {
-        return new mNonExported.mne.class1();
-    }
-    export var x3 = mNonExported.mne.x;
-    
-    export class class3 extends mNonExported.mne.class1 {
-    }
-    
-    var c4 = new mNonExported.mne.class1;
-    function f4() {
-        return new mNonExported.mne.class1();
-    }
-    var x4 = mNonExported.mne.x;
-    
-    class class4 extends mNonExported.mne.class1 {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
deleted file mode 100644
index ed5090279fd40..0000000000000
--- a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== indirectExternalModule.ts (0 errors) ====
-    export class indirectClass {
-    }
-==== externalModule.ts (0 errors) ====
-    import im0 = require("indirectExternalModule");
-    export var x = new im0.indirectClass();
-    
-==== test.ts (0 errors) ====
-    import im1 = require("externalModule");
-    export var x = im1.x;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
deleted file mode 100644
index 162f60016b6f7..0000000000000
--- a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== indirectExternalModule.ts (0 errors) ====
-    export class indirectClass {
-    }
-==== externalModule.ts (0 errors) ====
-    import im0 = require("indirectExternalModule");
-    export var x = new im0.indirectClass();
-    
-==== test.ts (0 errors) ====
-    import im1 = require("externalModule");
-    export var x = im1.x;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.errors.txt b/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.errors.txt
deleted file mode 100644
index ebfcea0af98dd..0000000000000
--- a/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== Test/tsconfig.json (0 errors) ====
-    { "files": [ "a.ts" ] }
-==== Test/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.errors.txt b/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.errors.txt
deleted file mode 100644
index e333a1b225fcf..0000000000000
--- a/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== Test/tsconfig.json (0 errors) ====
-    { "files": [ "a.ts" ] }
-==== Test/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
deleted file mode 100644
index b8f55915d4f74..0000000000000
--- a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== globalThisCapture.ts (0 errors) ====
-    // Add a lambda to ensure global 'this' capture is triggered
-    (()=>this.window);
-    
-==== __extends.ts (0 errors) ====
-    // class inheritance to ensure __extends is emitted
-    namespace m {
-        export class base {}
-        export class child extends base {}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
index 14f4663365e4f..31dfc62b1de14 100644
--- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== globalThisCapture.ts (0 errors) ====
     // Add a lambda to ensure global 'this' capture is triggered
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
deleted file mode 100644
index a01bffd6f0550..0000000000000
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== li'b/class'A.ts (0 errors) ====
-    namespace test {
-        export class ClassA
-        {
-            public method() { }
-        }
-    }
-==== m'ain.ts (0 errors) ====
-    /// <reference path="li'b/class'A.ts" />
-    
-    class ClassC extends test.ClassA {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
deleted file mode 100644
index 07a8aa4633c4e..0000000000000
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== li'b/class'A.ts (0 errors) ====
-    namespace test {
-        export class ClassA
-        {
-            public method() { }
-        }
-    }
-==== m'ain.ts (0 errors) ====
-    /// <reference path="li'b/class'A.ts" />
-    
-    class ClassC extends test.ClassA {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
deleted file mode 100644
index d7e28101b9377..0000000000000
--- a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== lib.ts (0 errors) ====
-    namespace Lib {
-        export class LibType {}
-    }
-    
-==== test.ts (0 errors) ====
-    /// <reference path="lib.ts" static='true' />
-    
-    var libType: Lib.LibType;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
deleted file mode 100644
index 10a5b21a8f645..0000000000000
--- a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== lib.ts (0 errors) ====
-    namespace Lib {
-        export class LibType {}
-    }
-    
-==== test.ts (0 errors) ====
-    /// <reference path="lib.ts" static='true' />
-    
-    var libType: Lib.LibType;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt
deleted file mode 100644
index 50f26f3c08d6d..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ../../../bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
-==== foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt
deleted file mode 100644
index 265dcf67beaa1..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ../../../bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
-==== foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.errors.txt
deleted file mode 100644
index bbffbb7d5b757..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
-==== src/ts/foo/foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.errors.txt
deleted file mode 100644
index 033c78f64dc8b..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
-==== src/ts/foo/foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.errors.txt
deleted file mode 100644
index 03a77445d9acd..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
-==== ../../../bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.errors.txt
deleted file mode 100644
index 72764a5d5c9f7..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
-==== ../../../bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
deleted file mode 100644
index f647ca73570f7..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ../../../bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
-==== ../../../src/ts/foo/foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
deleted file mode 100644
index 3340b539e9fa5..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ../../../bar/bar.ts (0 errors) ====
-    /// <reference path="../src/ts/foo/foo.ts" />
-    // This is bar.ts
-    class bar {
-    }
-==== ../../../src/ts/foo/foo.ts (0 errors) ====
-    /// <reference path="../../../bar/bar.ts" />
-    
-    class foo {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.errors.txt b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.errors.txt
deleted file mode 100644
index 45161e39e10e3..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    class test {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.errors.txt b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.errors.txt
deleted file mode 100644
index 5a5b572dc6e22..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    class test {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.errors.txt b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.errors.txt
deleted file mode 100644
index 45161e39e10e3..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    class test {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.errors.txt b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.errors.txt
deleted file mode 100644
index 5a5b572dc6e22..0000000000000
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    class test {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.errors.txt b/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.errors.txt
deleted file mode 100644
index 4061bec552b4e..0000000000000
--- a/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export function call() {
-        return "success";    
-    }
-    export var x = 1;
-==== consume.ts (0 errors) ====
-    import decl = require("./decl");
-    var str = decl.call();
-    
-    declare function fail();
-    
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.errors.txt b/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.errors.txt
deleted file mode 100644
index 9974eddc3def4..0000000000000
--- a/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export function call() {
-        return "success";    
-    }
-    export var x = 1;
-==== consume.ts (0 errors) ====
-    import decl = require("./decl");
-    var str = decl.call();
-    
-    declare function fail();
-    
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.errors.txt b/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.errors.txt
deleted file mode 100644
index 67c4e4276445a..0000000000000
--- a/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.d.ts (0 errors) ====
-    declare module "decl"
-    {
-        export function call();
-    }
-==== consume.ts (0 errors) ====
-    ///<reference path="decl.d.ts" />
-    import decl = require("decl");
-    var str = decl.call();
-    
-    declare function fail();
-    
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.errors.txt b/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.errors.txt
deleted file mode 100644
index 71989a7a7eed0..0000000000000
--- a/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.d.ts (0 errors) ====
-    declare module "decl"
-    {
-        export function call();
-    }
-==== consume.ts (0 errors) ====
-    ///<reference path="decl.d.ts" />
-    import decl = require("decl");
-    var str = decl.call();
-    
-    declare function fail();
-    
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeNested/amd/relativeNested.errors.txt b/tests/baselines/reference/project/relativeNested/amd/relativeNested.errors.txt
deleted file mode 100644
index d7c18c0883041..0000000000000
--- a/tests/baselines/reference/project/relativeNested/amd/relativeNested.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export function call() {
-        return "success";    
-    }
-    export var x = 1;
-==== consume.ts (0 errors) ====
-    import decl = require("../decl");
-    
-    declare function fail();
-    
-    export function call()
-    {
-        var str = decl.call();
-    
-    
-    
-        if (str !== "success")
-        {
-            fail();
-        }
-    }
-==== app.ts (0 errors) ====
-    import consume = require("./main/consume");
-    
-    consume.call();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeNested/node/relativeNested.errors.txt b/tests/baselines/reference/project/relativeNested/node/relativeNested.errors.txt
deleted file mode 100644
index 7999b36424ef5..0000000000000
--- a/tests/baselines/reference/project/relativeNested/node/relativeNested.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.ts (0 errors) ====
-    export function call() {
-        return "success";    
-    }
-    export var x = 1;
-==== consume.ts (0 errors) ====
-    import decl = require("../decl");
-    
-    declare function fail();
-    
-    export function call()
-    {
-        var str = decl.call();
-    
-    
-    
-        if (str !== "success")
-        {
-            fail();
-        }
-    }
-==== app.ts (0 errors) ====
-    import consume = require("./main/consume");
-    
-    consume.call();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.errors.txt b/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.errors.txt
deleted file mode 100644
index e09709f8a2af8..0000000000000
--- a/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.d.ts (0 errors) ====
-    declare module "decl"
-    {
-        export function call();
-    }
-==== main/consume.ts (0 errors) ====
-    ///<reference path="../decl.d.ts" />
-    import decl = require("decl");
-    var str = decl.call();
-    
-    declare function fail();
-    
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.errors.txt b/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.errors.txt
deleted file mode 100644
index a9dc85ea7d1f2..0000000000000
--- a/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== decl.d.ts (0 errors) ====
-    declare module "decl"
-    {
-        export function call();
-    }
-==== main/consume.ts (0 errors) ====
-    ///<reference path="../decl.d.ts" />
-    import decl = require("decl");
-    var str = decl.call();
-    
-    declare function fail();
-    
-    if(str !== "success") {
-        fail();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativePaths/amd/relativePaths.errors.txt b/tests/baselines/reference/project/relativePaths/amd/relativePaths.errors.txt
deleted file mode 100644
index 7203056d2abfd..0000000000000
--- a/tests/baselines/reference/project/relativePaths/amd/relativePaths.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    export function B(): void {
-        throw new Error('Should not be called');
-    }
-==== a.ts (0 errors) ====
-    import b = require('b');
-    
-    export function A(): void {
-        b.B();
-    }
-==== app.ts (0 errors) ====
-    import a = require('A/a');
-    
-    a.A();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/relativePaths/node/relativePaths.errors.txt b/tests/baselines/reference/project/relativePaths/node/relativePaths.errors.txt
deleted file mode 100644
index a7246844ddae6..0000000000000
--- a/tests/baselines/reference/project/relativePaths/node/relativePaths.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.ts (0 errors) ====
-    export function B(): void {
-        throw new Error('Should not be called');
-    }
-==== a.ts (0 errors) ====
-    import b = require('b');
-    
-    export function A(): void {
-        b.B();
-    }
-==== app.ts (0 errors) ====
-    import a = require('A/a');
-    
-    a.A();
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.errors.txt b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.errors.txt
deleted file mode 100644
index 9e41c3338fb3c..0000000000000
--- a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
-    class C {
-    }
-    
-==== FolderA/FolderB/fileB.ts (0 errors) ====
-    /// <reference path='FolderC/fileC.ts'/>
-    class B {
-        public c: C;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.errors.txt b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.errors.txt
deleted file mode 100644
index 1722096680e75..0000000000000
--- a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
-    class C {
-    }
-    
-==== FolderA/FolderB/fileB.ts (0 errors) ====
-    /// <reference path='FolderC/fileC.ts'/>
-    class B {
-        public c: C;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
index 7a71502a51064..4e3492c206fdb 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
@@ -1,12 +1,8 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
   The file is in the program because:
     Root file specified for compilation
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 !!! error TS6059:   The file is in the program because:
 !!! error TS6059:     Root file specified for compilation
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
index 6bb24b32a7b9d..4e3492c206fdb 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
   The file is in the program because:
     Root file specified for compilation
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 !!! error TS6059:   The file is in the program because:
 !!! error TS6059:     Root file specified for compilation
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.errors.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.errors.txt
deleted file mode 100644
index 9e41c3338fb3c..0000000000000
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
-    class C {
-    }
-    
-==== FolderA/FolderB/fileB.ts (0 errors) ====
-    /// <reference path='FolderC/fileC.ts'/>
-    class B {
-        public c: C;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.errors.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.errors.txt
deleted file mode 100644
index 1722096680e75..0000000000000
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
-    class C {
-    }
-    
-==== FolderA/FolderB/fileB.ts (0 errors) ====
-    /// <reference path='FolderC/fileC.ts'/>
-    class B {
-        public c: C;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryWithoutOutDir/amd/rootDirectoryWithoutOutDir.errors.txt b/tests/baselines/reference/project/rootDirectoryWithoutOutDir/amd/rootDirectoryWithoutOutDir.errors.txt
index 7a71502a51064..4e3492c206fdb 100644
--- a/tests/baselines/reference/project/rootDirectoryWithoutOutDir/amd/rootDirectoryWithoutOutDir.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryWithoutOutDir/amd/rootDirectoryWithoutOutDir.errors.txt
@@ -1,12 +1,8 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
   The file is in the program because:
     Root file specified for compilation
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 !!! error TS6059:   The file is in the program because:
 !!! error TS6059:     Root file specified for compilation
diff --git a/tests/baselines/reference/project/rootDirectoryWithoutOutDir/node/rootDirectoryWithoutOutDir.errors.txt b/tests/baselines/reference/project/rootDirectoryWithoutOutDir/node/rootDirectoryWithoutOutDir.errors.txt
index 6bb24b32a7b9d..4e3492c206fdb 100644
--- a/tests/baselines/reference/project/rootDirectoryWithoutOutDir/node/rootDirectoryWithoutOutDir.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryWithoutOutDir/node/rootDirectoryWithoutOutDir.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
   The file is in the program because:
     Root file specified for compilation
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 !!! error TS6059:   The file is in the program because:
 !!! error TS6059:     Root file specified for compilation
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt
index 04f498acb4492..b79cae049ffa5 100644
--- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt
@@ -1,11 +1,7 @@
 error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt
index 686d415edb7bc..b79cae049ffa5 100644
--- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt
@@ -1,9 +1,7 @@
 error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5051: Option 'sourceRoot can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 6e50d90f13b84..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index a5ca1482b5cd4..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 8463ae5b1a4d5..51edf2991adfc 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4685d61030d8a..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 07a45826b8bd9..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 8d5143f60ad82..247f9e4f2f2a1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 16c4884ea2d8b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 3d31526af0a6b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index 2e947050950b0..12592331fb591 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index c78e96ab66dc4..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 5336de40839f2..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index bc6455bd40ffe..42154149020d1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 3c41aa562c69b..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7319ec3d03e3d..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index 979a434de92b0..664beb97bc203 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 7c16ec1b548bc..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 477be2decfcb0..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
index 7e7a851c111e4..53fc18f86c749 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index 4793d714a6d0f..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 0d25528f041b5..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 17a2812a8c151..eb358c3b79d38 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
deleted file mode 100644
index a599424df40d9..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index babb41566a553..0000000000000
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index f174bdb49dd18..110e384982030 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
diff --git a/tests/baselines/reference/project/specifyExcludeUsingRelativepath/amd/specifyExcludeUsingRelativepath.errors.txt b/tests/baselines/reference/project/specifyExcludeUsingRelativepath/amd/specifyExcludeUsingRelativepath.errors.txt
deleted file mode 100644
index 427e3681ec178..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeUsingRelativepath/amd/specifyExcludeUsingRelativepath.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "declaration": true
-        },
-        "exclude": [
-            "./node_modules",
-            "./OutDir"  
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeUsingRelativepath/node/specifyExcludeUsingRelativepath.errors.txt b/tests/baselines/reference/project/specifyExcludeUsingRelativepath/node/specifyExcludeUsingRelativepath.errors.txt
deleted file mode 100644
index e24ede6c05610..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeUsingRelativepath/node/specifyExcludeUsingRelativepath.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "declaration": true
-        },
-        "exclude": [
-            "./node_modules",
-            "./OutDir"  
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/amd/specifyExcludeUsingRelativepathWithAllowJS.errors.txt b/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/amd/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
deleted file mode 100644
index 26658d309e487..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/amd/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "allowJs": true
-        },
-        "exclude": [
-            "./node_modules",
-            "./OutDir"  
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/node/specifyExcludeUsingRelativepathWithAllowJS.errors.txt b/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/node/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
deleted file mode 100644
index 2439b82b7c5f4..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/node/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "./OutDir",
-            "allowJs": true
-        },
-        "exclude": [
-            "./node_modules",
-            "./OutDir"  
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/amd/specifyExcludeWithOutUsingRelativePath.errors.txt b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/amd/specifyExcludeWithOutUsingRelativePath.errors.txt
deleted file mode 100644
index ae52d48bc64d9..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/amd/specifyExcludeWithOutUsingRelativePath.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "declaration": true
-        },
-        "exclude": [
-            "node_modules",
-            "OutDir"
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/node/specifyExcludeWithOutUsingRelativePath.errors.txt b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/node/specifyExcludeWithOutUsingRelativePath.errors.txt
deleted file mode 100644
index 423a4e03772e1..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/node/specifyExcludeWithOutUsingRelativePath.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "declaration": true
-        },
-        "exclude": [
-            "node_modules",
-            "OutDir"
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/amd/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/amd/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
deleted file mode 100644
index 31e94df7ec0e1..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/amd/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (2 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "allowJs": true
-        },
-        "exclude": [
-            "node_modules",
-            "OutDir"
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/node/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/node/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
deleted file mode 100644
index 1da1dcec92d07..0000000000000
--- a/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/node/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tsconfig.json(2,5): error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    { 
-        "compilerOptions": {
-        ~~~~~~~~~~~~~~~~~
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-            "outDir": "OutDir",
-            "allowJs": true
-        },
-        "exclude": [
-            "node_modules",
-            "OutDir"
-        ]
-    }
-==== a.ts (0 errors) ====
-        var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.errors.txt b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.errors.txt
deleted file mode 100644
index b77acf2ad6542..0000000000000
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== fs.ts (0 errors) ====
-    import commands = require('./commands');
-    
-    export class RM {
-    
-        public getName() {
-            return 'rm';
-        }
-    
-        public getDescription() {
-            return "\t\t\tDelete file";
-        }
-    
-        private run(configuration: commands.IConfiguration) {
-            var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
-        }
-    }
-==== server.ts (0 errors) ====
-    export interface IServer {
-    }
-    
-    export interface IWorkspace {
-    	toAbsolutePath(server:IServer, workspaceRelativePath?:string):string;
-    }
-==== commands.ts (0 errors) ====
-    import fs = require('fs');
-    import server = require('server');
-    
-    export interface IConfiguration {
-        workspace: server.IWorkspace;
-        server?: server.IServer;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.errors.txt b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.errors.txt
deleted file mode 100644
index 08306b9f63710..0000000000000
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.errors.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== fs.ts (0 errors) ====
-    import commands = require('./commands');
-    
-    export class RM {
-    
-        public getName() {
-            return 'rm';
-        }
-    
-        public getDescription() {
-            return "\t\t\tDelete file";
-        }
-    
-        private run(configuration: commands.IConfiguration) {
-            var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
-        }
-    }
-==== server.ts (0 errors) ====
-    export interface IServer {
-    }
-    
-    export interface IWorkspace {
-    	toAbsolutePath(server:IServer, workspaceRelativePath?:string):string;
-    }
-==== commands.ts (0 errors) ====
-    import fs = require('fs');
-    import server = require('server');
-    
-    export interface IConfiguration {
-        workspace: server.IWorkspace;
-        server?: server.IServer;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt
index e4a31039c53ea..88f77a6a2e84e 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt
@@ -1,12 +1,8 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,22): error TS1006: A file cannot have a reference to itself.
 main.ts(2,22): error TS6053: File 'nonExistingFile1.ts' not found.
 main.ts(3,22): error TS6053: File 'nonExistingFile2.ts' not found.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     /// <reference path="main.ts" />
                          ~~~~~~~
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt
index c8ace33a22355..88f77a6a2e84e 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 main.ts(1,22): error TS1006: A file cannot have a reference to itself.
 main.ts(2,22): error TS6053: File 'nonExistingFile1.ts' not found.
 main.ts(3,22): error TS6053: File 'nonExistingFile2.ts' not found.
 
 
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== main.ts (3 errors) ====
     /// <reference path="main.ts" />
                          ~~~~~~~
diff --git a/tests/baselines/reference/propTypeValidatorInference.js b/tests/baselines/reference/propTypeValidatorInference.js
index 5d436e427ea88..c1e4f13d2865d 100644
--- a/tests/baselines/reference/propTypeValidatorInference.js
+++ b/tests/baselines/reference/propTypeValidatorInference.js
@@ -91,41 +91,8 @@ const x: true = (null as any as ExtractPropsMatch);
 
 //// [file.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var PropTypes = __importStar(require("prop-types"));
+var PropTypes = require("prop-types");
 var innerProps = {
     foo: PropTypes.string.isRequired,
     bar: PropTypes.bool,
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index 31af18b97fd91..737e8ef2382af 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -29,19 +29,21 @@ var y: Foo2;
 
 //// [propertyIdentityWithPrivacyMismatch_0.js]
 //// [propertyIdentityWithPrivacyMismatch_1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var x;
-var x; // Should be error (mod1.Foo !== mod2.Foo)
-var Foo1 = /** @class */ (function () {
-    function Foo1() {
-    }
-    return Foo1;
-}());
-var Foo2 = /** @class */ (function () {
-    function Foo2() {
-    }
-    return Foo2;
-}());
-var y;
-var y;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var x;
+    var x; // Should be error (mod1.Foo !== mod2.Foo)
+    var Foo1 = /** @class */ (function () {
+        function Foo1() {
+        }
+        return Foo1;
+    }());
+    var Foo2 = /** @class */ (function () {
+        function Foo2() {
+        }
+        return Foo2;
+    }());
+    var y;
+    var y;
+});
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
index ebbf9189e4ead..b0a50abe5170f 100644
--- a/tests/baselines/reference/reExportDefaultExport.js
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -22,11 +22,8 @@ function f() {
 }
 //// [m2.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var m1_1 = __importDefault(require("./m1"));
+var m1_1 = require("./m1");
 var m1_2 = require("./m1");
 (0, m1_2.f)();
 (0, m1_1.default)();
diff --git a/tests/baselines/reference/reExportJsFromTs.js b/tests/baselines/reference/reExportJsFromTs.js
index e861b4770a350..623425d82d75f 100644
--- a/tests/baselines/reference/reExportJsFromTs.js
+++ b/tests/baselines/reference/reExportJsFromTs.js
@@ -15,40 +15,7 @@ module.exports = {
 };
 //// [constants.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsConstants = void 0;
-var tsConstants = __importStar(require("../lib/constants"));
+var tsConstants = require("../lib/constants");
 exports.tsConstants = tsConstants;
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js
index 3f2595dc88e40..5a52664ee1338 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.js
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.js
@@ -15,39 +15,6 @@ declare var foo: any;
 
 //// [test.jsx]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var myReactLib = __importStar(require("my-React-Lib")); // should not be elided
+var myReactLib = require("my-React-Lib"); // should not be elided
 <foo data/>;
diff --git a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
index 1263b13d2bdf7..1e10a91594c0d 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -40,42 +40,9 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 function myHigherOrderComponent(Inner) {
     return /** @class */ (function (_super) {
         __extends(OuterComponent, _super);
diff --git a/tests/baselines/reference/reactSFCAndFunctionResolvable.js b/tests/baselines/reference/reactSFCAndFunctionResolvable.js
index f94bcb741c506..edc278d0acf9e 100644
--- a/tests/baselines/reference/reactSFCAndFunctionResolvable.js
+++ b/tests/baselines/reference/reactSFCAndFunctionResolvable.js
@@ -30,41 +30,8 @@ const RandomComponent: React.SFC = () => {
 //// [reactSFCAndFunctionResolvable.js]
 "use strict";
 /// <reference path="react16.d.ts" />
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var RandomComponent = function () {
     var Component = condition1
         ? Radio
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
index 2a4d1956ef323..d4a9f0578b5d7 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
@@ -27,41 +27,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var classes = "";
 var rest = {};
 var children = [];
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
index 02ed32721483c..d74cf6df32af0 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
@@ -27,41 +27,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var classes = "";
 var rest = {};
 var children = [];
diff --git a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
index 10a2ec13f6e94..5c1b595940e4d 100644
--- a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
+++ b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
@@ -36,11 +36,8 @@ export default Form
 
 //// [index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_emotion_1 = __importDefault(require("react-emotion"));
+var react_emotion_1 = require("react-emotion");
 var Form = (0, react_emotion_1.default)('div')({ color: "red" });
 exports.default = Form;
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.errors.txt
index 5107eac3d64ff..d3e5485b51fbb 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.errors.txt
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.errors.txt
@@ -4,7 +4,7 @@ recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts(2,5): error TS2303:
 ==== recursiveExportAssignmentAndFindAliasedType1_moduleA.ts (0 errors) ====
     /// <reference path="recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts"/>
     import moduleC = require("moduleC");
-    import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB");
+    import ClassB = require("recursiveExportAssignmentAndFindAliasedType1_moduleB");
     export var b: ClassB; // This should result in type ClassB
 ==== recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts (1 errors) ====
     declare module "moduleC" {
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index 40bbc2c9cf211..438620859265f 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -13,18 +13,22 @@ export = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.ts]
 /// <reference path="recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts"/>
 import moduleC = require("moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType1_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols
index 39da715015343..6b97575ff1fb4 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols
@@ -5,7 +5,7 @@
 import moduleC = require("moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType1_moduleB");
 >ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleA.ts, 1, 36))
 
 export var b: ClassB; // This should result in type ClassB
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
index 888968d2858bd..9865b081e8849 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
@@ -6,7 +6,7 @@ import moduleC = require("moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType1_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.errors.txt
index 95c33f6746f5a..1bed5684d1f93 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.errors.txt
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.errors.txt
@@ -4,7 +4,7 @@ recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(2,5): error TS2303:
 ==== recursiveExportAssignmentAndFindAliasedType2_moduleA.ts (0 errors) ====
     /// <reference path="recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts"/>
     import moduleC = require("moduleC");
-    import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB");
+    import ClassB = require("recursiveExportAssignmentAndFindAliasedType2_moduleB");
     export var b: ClassB; // This should result in type ClassB
 ==== recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts (1 errors) ====
     declare module "moduleC" {
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index 28dafc1dce3be..5f8c71998018d 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -17,18 +17,22 @@ export = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.ts]
 /// <reference path="recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts"/>
 import moduleC = require("moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType2_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols
index 54bd6aae65b8f..471cf999a06da 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols
@@ -5,7 +5,7 @@
 import moduleC = require("moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType2_moduleB");
 >ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleA.ts, 1, 36))
 
 export var b: ClassB; // This should result in type ClassB
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
index 655c5c1f566f7..649acc81d37d0 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
@@ -6,7 +6,7 @@ import moduleC = require("moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType2_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.errors.txt
index ce36cbc17ff0c..659de7630fb63 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.errors.txt
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.errors.txt
@@ -4,7 +4,7 @@ recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(2,5): error TS2303:
 ==== recursiveExportAssignmentAndFindAliasedType3_moduleA.ts (0 errors) ====
     /// <reference path="recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts"/>
     import moduleC = require("moduleC");
-    import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB");
+    import ClassB = require("recursiveExportAssignmentAndFindAliasedType3_moduleB");
     export var b: ClassB; // This should result in type ClassB
 ==== recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts (1 errors) ====
     declare module "moduleC" {
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index 0cb5acfef107b..6607502273371 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -21,18 +21,22 @@ export = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.ts]
 /// <reference path="recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts"/>
 import moduleC = require("moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType3_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols
index 919869325088f..1324169d71890 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols
@@ -5,7 +5,7 @@
 import moduleC = require("moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType3_moduleB");
 >ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleA.ts, 1, 36))
 
 export var b: ClassB; // This should result in type ClassB
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
index bab5c22a5f4b3..ced2bff504fe3 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
@@ -6,7 +6,7 @@ import moduleC = require("moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType3_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.errors.txt
index 2dfcb34389528..6097f6a4dffe7 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.errors.txt
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.errors.txt
@@ -2,12 +2,12 @@ recursiveExportAssignmentAndFindAliasedType4_moduleC.ts(1,1): error TS2303: Circ
 
 
 ==== recursiveExportAssignmentAndFindAliasedType4_moduleA.ts (0 errors) ====
-    import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
-    import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB");
+    import moduleC = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
+    import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB");
     export var b: ClassB; // This should result in type ClassB
 ==== recursiveExportAssignmentAndFindAliasedType4_moduleC.ts (1 errors) ====
-    import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    import self = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2303: Circular definition of import alias 'self'.
     export = self;
     
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index e86ca3080fc0d..507ef29c4aede 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts] ////
 
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleC.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.ts]
@@ -9,23 +9,28 @@ class ClassB { }
 export = ClassB;
 
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.ts]
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleC.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType4_moduleC"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.symbols
index be2c5d433ab69..57b1068aa42c5 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.symbols
@@ -1,18 +1,18 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType4_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB");
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 83))
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 81))
 
 export var b: ClassB; // This should result in type ClassB
 >b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 2, 10))
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 83))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 81))
 
 === recursiveExportAssignmentAndFindAliasedType4_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleC.ts, 0, 0))
 
 export = self;
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types
index 512d9aaff9111..a3abe4607859f 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType4_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
@@ -14,7 +14,7 @@ export var b: ClassB; // This should result in type ClassB
 >  : ^^^^^^
 
 === recursiveExportAssignmentAndFindAliasedType4_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
 >self : any
 >     : ^^^
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.errors.txt
index abba655a10667..2a748792f3933 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.errors.txt
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.errors.txt
@@ -2,16 +2,16 @@ recursiveExportAssignmentAndFindAliasedType5_moduleD.ts(1,1): error TS2303: Circ
 
 
 ==== recursiveExportAssignmentAndFindAliasedType5_moduleA.ts (0 errors) ====
-    import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
-    import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB");
+    import moduleC = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
+    import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB");
     export var b: ClassB; // This should result in type ClassB
 ==== recursiveExportAssignmentAndFindAliasedType5_moduleC.ts (0 errors) ====
-    import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
+    import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleD");
     export = self;
     
 ==== recursiveExportAssignmentAndFindAliasedType5_moduleD.ts (1 errors) ====
-    import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2303: Circular definition of import alias 'self'.
     export = self;
     
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 601138d2fde02..f5236e4a8ebc9 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts] ////
 
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleC.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleD");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleD.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.ts]
@@ -13,27 +13,33 @@ class ClassB { }
 export = ClassB;
 
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.ts]
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleD.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType5_moduleC"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleC.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType5_moduleD"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.symbols
index 45145f3995770..8382e50c9b68e 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.symbols
@@ -1,25 +1,25 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType5_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB");
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 83))
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 81))
 
 export var b: ClassB; // This should result in type ClassB
 >b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 2, 10))
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 83))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 81))
 
 === recursiveExportAssignmentAndFindAliasedType5_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleD");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleC.ts, 0, 0))
 
 export = self;
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleC.ts, 0, 0))
 
 === recursiveExportAssignmentAndFindAliasedType5_moduleD.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleD.ts, 0, 0))
 
 export = self;
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types
index 93a14f8b6870d..5ec0db9227124 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType5_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
@@ -14,7 +14,7 @@ export var b: ClassB; // This should result in type ClassB
 >  : ^^^^^^
 
 === recursiveExportAssignmentAndFindAliasedType5_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleD");
 >self : any
 >     : ^^^
 
@@ -23,7 +23,7 @@ export = self;
 >     : ^^^
 
 === recursiveExportAssignmentAndFindAliasedType5_moduleD.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
 >self : any
 >     : ^^^
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.errors.txt
index 60e523cad3e2c..242e633456ccd 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.errors.txt
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.errors.txt
@@ -2,20 +2,20 @@ recursiveExportAssignmentAndFindAliasedType6_moduleE.ts(1,1): error TS2303: Circ
 
 
 ==== recursiveExportAssignmentAndFindAliasedType6_moduleA.ts (0 errors) ====
-    import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
-    import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB");
+    import moduleC = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
+    import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB");
     export var b: ClassB; // This should result in type ClassB
 ==== recursiveExportAssignmentAndFindAliasedType6_moduleC.ts (0 errors) ====
-    import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
+    import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleD");
     export = self;
     
 ==== recursiveExportAssignmentAndFindAliasedType6_moduleD.ts (0 errors) ====
-    import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
+    import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleE");
     export = self;
     
 ==== recursiveExportAssignmentAndFindAliasedType6_moduleE.ts (1 errors) ====
-    import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2303: Circular definition of import alias 'self'.
     export = self;
     
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index 245b377424ad3..d4f49880587e7 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -1,15 +1,15 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts] ////
 
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleC.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleD");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleD.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleE");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleE.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.ts]
@@ -17,31 +17,38 @@ class ClassB { }
 export = ClassB;
 
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.ts]
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleE.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleC"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleD.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleE"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleC.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleD"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.symbols
index 55f08c902157b..ea40f8b5c0e38 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.symbols
@@ -1,32 +1,32 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB");
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 83))
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 81))
 
 export var b: ClassB; // This should result in type ClassB
 >b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 2, 10))
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 83))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 81))
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleD");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleC.ts, 0, 0))
 
 export = self;
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleC.ts, 0, 0))
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleD.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleE");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleD.ts, 0, 0))
 
 export = self;
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleD.ts, 0, 0))
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleE.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleE.ts, 0, 0))
 
 export = self;
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types
index c3bb9d576c077..f525b59a903ff 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
@@ -14,7 +14,7 @@ export var b: ClassB; // This should result in type ClassB
 >  : ^^^^^^
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleD");
 >self : any
 >     : ^^^
 
@@ -23,7 +23,7 @@ export = self;
 >     : ^^^
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleD.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleE");
 >self : any
 >     : ^^^
 
@@ -32,7 +32,7 @@ export = self;
 >     : ^^^
 
 === recursiveExportAssignmentAndFindAliasedType6_moduleE.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
 >self : any
 >     : ^^^
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index c251691bc4dbf..7b4a013d7445d 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -1,16 +1,16 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts] ////
 
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleC.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
 var selfVar = self;
 export = selfVar;
 
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleD.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleE");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleE.ts]
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
 export = self;
 
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleB.ts]
@@ -18,32 +18,39 @@ class ClassB { }
 export = ClassB;
 
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.ts]
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleE.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleC"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleD.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE");
-module.exports = self;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleE"], function (require, exports, self) {
+    "use strict";
+    return self;
+});
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleC.js]
-"use strict";
-var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
-var selfVar = self;
-module.exports = selfVar;
+define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleD"], function (require, exports, self) {
+    "use strict";
+    var selfVar = self;
+    return selfVar;
+});
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleB.js]
-"use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
-    }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
     return ClassB;
-}());
-module.exports = ClassB;
+});
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.b = void 0;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.b = void 0;
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.symbols
index e9095b64c9f2b..6cbe4cff5e4d1 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.symbols
@@ -1,18 +1,18 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
 >moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 0))
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB");
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 83))
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 81))
 
 export var b: ClassB; // This should result in type ClassB
 >b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 2, 10))
->ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 83))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 81))
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleC.ts, 0, 0))
 
 var selfVar = self;
@@ -23,14 +23,14 @@ export = selfVar;
 >selfVar : Symbol(selfVar, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleC.ts, 1, 3))
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleD.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleE");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleD.ts, 0, 0))
 
 export = self;
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleD.ts, 0, 0))
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleE.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleE.ts, 0, 0))
 
 export = self;
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
index bbb23bb2e04de..9b93f1a1db073 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts] ////
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleA.ts ===
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
 >moduleC : any
 >        : ^^^
 
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
 >ClassB : typeof ClassB
 >       : ^^^^^^^^^^^^^
 
@@ -14,7 +14,7 @@ export var b: ClassB; // This should result in type ClassB
 >  : ^^^^^^
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleC.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
 >self : any
 >     : ^^^
 
@@ -27,7 +27,7 @@ export = selfVar;
 >        : ^^^
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleD.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleE");
 >self : any
 >     : ^^^
 
@@ -36,7 +36,7 @@ export = self;
 >     : ^^^
 
 === recursiveExportAssignmentAndFindAliasedType7_moduleE.ts ===
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
 >self : any
 >     : ^^^
 
diff --git a/tests/baselines/reference/reexportMissingDefault.js b/tests/baselines/reference/reexportMissingDefault.js
index 1725ac4b081d4..5b1c75d789188 100644
--- a/tests/baselines/reference/reexportMissingDefault.js
+++ b/tests/baselines/reference/reexportMissingDefault.js
@@ -14,12 +14,9 @@ exports.b = void 0;
 exports.b = null;
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.b = void 0;
 var b_1 = require("./b");
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } });
 var b_2 = require("./b");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault2.js b/tests/baselines/reference/reexportMissingDefault2.js
index 692f273b47bec..ed22d1b8871d4 100644
--- a/tests/baselines/reference/reexportMissingDefault2.js
+++ b/tests/baselines/reference/reexportMissingDefault2.js
@@ -14,12 +14,9 @@ exports.b = void 0;
 exports.b = null;
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.b = void 0;
 var b_1 = require("./b");
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } });
 var b_2 = require("./b");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault3.js b/tests/baselines/reference/reexportMissingDefault3.js
index e1e5b82c8594c..22a0fac06cce8 100644
--- a/tests/baselines/reference/reexportMissingDefault3.js
+++ b/tests/baselines/reference/reexportMissingDefault3.js
@@ -14,12 +14,9 @@ exports.b = void 0;
 exports.b = null;
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = exports.b = void 0;
 var b_1 = require("./b");
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } });
 var b_2 = require("./b");
-Object.defineProperty(exports, "a", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
+Object.defineProperty(exports, "a", { enumerable: true, get: function () { return b_2.default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault4.js b/tests/baselines/reference/reexportMissingDefault4.js
index 374fc21f4afc3..b002bc24e8cd0 100644
--- a/tests/baselines/reference/reexportMissingDefault4.js
+++ b/tests/baselines/reference/reexportMissingDefault4.js
@@ -10,12 +10,9 @@ export { default } from "./b";
 
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.b = void 0;
 var b_1 = require("./b");
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } });
 var b_2 = require("./b");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault5.errors.txt b/tests/baselines/reference/reexportMissingDefault5.errors.txt
deleted file mode 100644
index 140fa902578db..0000000000000
--- a/tests/baselines/reference/reexportMissingDefault5.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== b.d.ts (0 errors) ====
-    declare var b: number;
-    export { b };
-    
-==== a.ts (0 errors) ====
-    export { b } from "./b";
-    export { default as Foo } from "./b";
\ No newline at end of file
diff --git a/tests/baselines/reference/reexportMissingDefault6.js b/tests/baselines/reference/reexportMissingDefault6.js
index 7fa90d4236dfb..d1ee2ecb562b7 100644
--- a/tests/baselines/reference/reexportMissingDefault6.js
+++ b/tests/baselines/reference/reexportMissingDefault6.js
@@ -14,12 +14,9 @@ exports.b = void 0;
 exports.b = null;
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.b = void 0;
 var b_1 = require("./b");
 Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } });
 var b_2 = require("./b");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } });
diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt b/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
index 99bdcce1c7099..851c7894b6a92 100644
--- a/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 somefolder/a.ts(1,17): error TS2792: Cannot find module './b'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== somefolder/a.ts (1 errors) ====
     import {x} from "./b"
                     ~~~~~
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
deleted file mode 100644
index 61d4d95b60bdd..0000000000000
--- a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test/file1.ts (0 errors) ====
-    import foo = require('foo');
-    import other = require('./other');
-    import relMod = require('./sub/relMod');
-    
-    if(foo.M2.x){
-    	var x = new relMod(other.M2.x.charCodeAt(0));
-    }
-    
-==== test/foo.d.ts (0 errors) ====
-    export declare namespace M2 {
-    	export var x: boolean;
-    }
-    
-==== test/other.d.ts (0 errors) ====
-    export declare namespace M2 {
-    	export var x: string;
-    }
-    
-==== test/sub/relMod.d.ts (0 errors) ====
-    declare class Test {
-    	constructor(x: number);
-    }
-    export = Test;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js
index e49f78b2e7b0a..5f3b7c3f4dcf5 100644
--- a/tests/baselines/reference/requireAsFunctionInExternalModule.js
+++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js
@@ -25,42 +25,9 @@ function require(a) { }
 function has(a) { return true; }
 //// [m.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hello = hello;
-var c_1 = __importStar(require("./c"));
+var c_1 = require("./c");
 function hello() { }
 if ((0, c_1.has)('ember-debug')) {
     (0, c_1.default)('ember-debug');
diff --git a/tests/baselines/reference/requireEmitSemicolon.errors.txt b/tests/baselines/reference/requireEmitSemicolon.errors.txt
deleted file mode 100644
index ee48ee9b36f1a..0000000000000
--- a/tests/baselines/reference/requireEmitSemicolon.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== requireEmitSemicolon_1.ts (0 errors) ====
-    ///<reference path='requireEmitSemicolon_0.ts'/>
-    import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node
-    
-    export namespace Database {
-    	export class DB {
-    	    public findPerson(id: number): P.Models.Person {
-    	        return new P.Models.Person("Rock");
-    	    }
-    	}
-    } 
-==== requireEmitSemicolon_0.ts (0 errors) ====
-    export namespace Models {
-    	export class Person {
-            constructor(name: string) { }
-    	}
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt b/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt
index a9e01c4345e31..7519e14cf86f9 100644
--- a/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt
@@ -1,10 +1,8 @@
 error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file1.ts(1,21): error TS2792: Cannot find module './b'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 !!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (1 errors) ====
     import b1 = require('./b');
                         ~~~~~
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
index 44d3758ebc6b6..db18d33c600a2 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
@@ -1,10 +1,8 @@
 error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 
 !!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (1 errors) ====
     import * as b from './b.json';
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmd.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmd.errors.txt
index 8c407e1b674c1..b751a1a3ab69d 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmd.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmd.errors.txt
@@ -1,9 +1,7 @@
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     import * as b from './b.json';
     
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
index 8c407e1b674c1..b751a1a3ab69d 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
@@ -1,9 +1,7 @@
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     import * as b from './b.json';
     
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
index 1f804dd8bace3..2d750ddc6fcc5 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
@@ -1,12 +1,10 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (1 errors) ====
     import * as b from './b.json';
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitSystem.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitSystem.errors.txt
index 89b01a4b0a7a9..cd0affe7ce19f 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitSystem.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitSystem.errors.txt
@@ -1,11 +1,9 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     import * as b from './b.json';
     
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitUmd.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitUmd.errors.txt
index 57dd7db1aa6a2..cd0affe7ce19f 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitUmd.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitUmd.errors.txt
@@ -1,11 +1,9 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (0 errors) ====
     import * as b from './b.json';
     
diff --git a/tests/baselines/reference/resolutionModeImportType1(moduleresolution=classic).errors.txt b/tests/baselines/reference/resolutionModeImportType1(moduleresolution=classic).errors.txt
index 7de26d273b827..f7596129d6f40 100644
--- a/tests/baselines/reference/resolutionModeImportType1(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/resolutionModeImportType1(moduleresolution=classic).errors.txt
@@ -1,7 +1,6 @@
 error TS2688: Cannot find type definition file for 'foo'.
   The file is in the program because:
     Entry point for implicit type library 'foo'
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /app.ts(1,30): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 /app.ts(2,29): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 /app.ts(3,30): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -10,7 +9,6 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS2688: Cannot find type definition file for 'foo'.
 !!! error TS2688:   The file is in the program because:
 !!! error TS2688:     Entry point for implicit type library 'foo'
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /node_modules/@types/foo/package.json (0 errors) ====
     {
       "name": "@types/foo",
diff --git a/tests/baselines/reference/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt b/tests/baselines/reference/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt
index a5ade620990a9..8e52a8e3c12ce 100644
--- a/tests/baselines/reference/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt
@@ -1,7 +1,6 @@
 error TS2688: Cannot find type definition file for 'foo'.
   The file is in the program because:
     Entry point for implicit type library 'foo'
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /app.ts(1,35): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 /app.ts(2,34): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 /app.ts(3,35): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -10,7 +9,6 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS2688: Cannot find type definition file for 'foo'.
 !!! error TS2688:   The file is in the program because:
 !!! error TS2688:     Entry point for implicit type library 'foo'
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /node_modules/@types/foo/package.json (0 errors) ====
     {
       "name": "@types/foo",
diff --git a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
index 2abf6e9510631..dfe5e199b6fe6 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -33,42 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 var TestComponent = /** @class */ (function (_super) {
     __extends(TestComponent, _super);
     function TestComponent() {
diff --git a/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js b/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
index 1f37a83f5b5bf..a5670ff683fb7 100644
--- a/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
+++ b/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
@@ -47,25 +47,13 @@ File: c.ts
 import x from 'b'
 var z = 1;
 resolvedModules:
-b: esnext: {
-  "failedLookupLocations": [
-    "/package.json",
-    "/node_modules/b/package.json",
-    "/node_modules/b.ts",
-    "/node_modules/b.tsx",
-    "/node_modules/b.d.ts",
-    "/node_modules/b/index.ts",
-    "/node_modules/b/index.tsx",
-    "/node_modules/b/index.d.ts",
-    "/node_modules/@types/b/package.json",
-    "/node_modules/@types/b.d.ts",
-    "/node_modules/@types/b/index.d.ts",
-    "/node_modules/b/package.json",
-    "/node_modules/b.js",
-    "/node_modules/b.jsx",
-    "/node_modules/b/index.js",
-    "/node_modules/b/index.jsx"
-  ]
+b: {
+  "resolvedModule": {
+    "resolvedFileName": "/b.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 File: b.ts
@@ -102,6 +90,6 @@ MissingPaths:: [
 
 a.ts(3,22): error TS6053: File 'non-existing-file.ts' not found.
 a.ts(4,23): error TS2688: Cannot find type definition file for 'typerefs'.
-c.ts(2,15): error TS2307: Cannot find module 'b' or its corresponding type declarations.
+c.ts(2,15): error TS2306: File 'b.ts' is not a module.
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js b/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js
index e5512f595c5da..8b303e2c4ca79 100644
--- a/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js
+++ b/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js
@@ -108,8 +108,7 @@ b: {
 
 MissingPaths:: []
 
-home/src/workspaces/project/a.ts(3,3): error TS2345: Argument of type 'X' is not assignable to parameter of type 'import("/home/src/workspaces/project/node_modules/a/node_modules/x/index").default'.
-  Types have separate declarations of a private property 'x'.
+home/src/workspaces/project/node_modules/b/index.d.ts(2,8): error TS1259: Module '"/home/src/workspaces/project/node_modules/b/node_modules/x/index"' can only be default-imported using the 'allowSyntheticDefaultImports' flag
 home/src/workspaces/project/node_modules/b/node_modules/x/index.d.ts(3,16): error TS2714: The expression of an export assignment must be an identifier or qualified name in an ambient context.
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/redirect-with-getSourceFileByPath-previous-duplicate-packages.js b/tests/baselines/reference/reuseProgramStructure/redirect-with-getSourceFileByPath-previous-duplicate-packages.js
index e5512f595c5da..8b303e2c4ca79 100644
--- a/tests/baselines/reference/reuseProgramStructure/redirect-with-getSourceFileByPath-previous-duplicate-packages.js
+++ b/tests/baselines/reference/reuseProgramStructure/redirect-with-getSourceFileByPath-previous-duplicate-packages.js
@@ -108,8 +108,7 @@ b: {
 
 MissingPaths:: []
 
-home/src/workspaces/project/a.ts(3,3): error TS2345: Argument of type 'X' is not assignable to parameter of type 'import("/home/src/workspaces/project/node_modules/a/node_modules/x/index").default'.
-  Types have separate declarations of a private property 'x'.
+home/src/workspaces/project/node_modules/b/index.d.ts(2,8): error TS1259: Module '"/home/src/workspaces/project/node_modules/b/node_modules/x/index"' can only be default-imported using the 'allowSyntheticDefaultImports' flag
 home/src/workspaces/project/node_modules/b/node_modules/x/index.d.ts(3,16): error TS2714: The expression of an export assignment must be an identifier or qualified name in an ambient context.
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js b/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js
index 56a1711400865..abffd89746113 100644
--- a/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js
+++ b/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js
@@ -1,68 +1,54 @@
 Program 1 Reused:: Not
+File: /b.ts
+
+
+var y = 2
+
 File: a.ts
 
 import {_} from 'b'
 var x = 1
 resolvedModules:
-b: esnext: {
-  "failedLookupLocations": [
-    "/package.json",
-    "/node_modules/b/package.json",
-    "/node_modules/b.ts",
-    "/node_modules/b.tsx",
-    "/node_modules/b.d.ts",
-    "/node_modules/b/index.ts",
-    "/node_modules/b/index.tsx",
-    "/node_modules/b/index.d.ts",
-    "/node_modules/@types/b/package.json",
-    "/node_modules/@types/b.d.ts",
-    "/node_modules/@types/b/index.d.ts",
-    "/node_modules/b/package.json",
-    "/node_modules/b.js",
-    "/node_modules/b.jsx",
-    "/node_modules/b/index.js",
-    "/node_modules/b/index.jsx"
-  ]
+b: {
+  "resolvedModule": {
+    "resolvedFileName": "/b.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 
 MissingPaths:: []
 
-a.ts(2,17): error TS2307: Cannot find module 'b' or its corresponding type declarations.
+a.ts(2,17): error TS2306: File '/b.ts' is not a module.
 
 
 
 Program 2 Reused:: Completely
+File: /b.ts
+
+
+var y = 2
+
 File: a.ts
 
 import {_} from 'b'
 var x = 2
 resolvedModules:
-b: esnext: {
-  "failedLookupLocations": [
-    "/package.json",
-    "/node_modules/b/package.json",
-    "/node_modules/b.ts",
-    "/node_modules/b.tsx",
-    "/node_modules/b.d.ts",
-    "/node_modules/b/index.ts",
-    "/node_modules/b/index.tsx",
-    "/node_modules/b/index.d.ts",
-    "/node_modules/@types/b/package.json",
-    "/node_modules/@types/b.d.ts",
-    "/node_modules/@types/b/index.d.ts",
-    "/node_modules/b/package.json",
-    "/node_modules/b.js",
-    "/node_modules/b.jsx",
-    "/node_modules/b/index.js",
-    "/node_modules/b/index.jsx"
-  ]
+b: {
+  "resolvedModule": {
+    "resolvedFileName": "/b.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 
 MissingPaths:: []
 
-a.ts(2,17): error TS2307: Cannot find module 'b' or its corresponding type declarations.
+a.ts(2,17): error TS2306: File '/b.ts' is not a module.
 
 
 
@@ -79,6 +65,11 @@ MissingPaths:: []
 
 
 Program 4 Reused:: SafeModules
+File: /b.ts
+
+
+var y = 2
+
 File: a.ts
 
 import x from 'b'
@@ -86,51 +77,31 @@ import x from 'b'
                 
 var x = 2
 resolvedModules:
-b: esnext: {
-  "failedLookupLocations": [
-    "/package.json",
-    "/node_modules/b/package.json",
-    "/node_modules/b.ts",
-    "/node_modules/b.tsx",
-    "/node_modules/b.d.ts",
-    "/node_modules/b/index.ts",
-    "/node_modules/b/index.tsx",
-    "/node_modules/b/index.d.ts",
-    "/node_modules/@types/b/package.json",
-    "/node_modules/@types/b.d.ts",
-    "/node_modules/@types/b/index.d.ts",
-    "/node_modules/b/package.json",
-    "/node_modules/b.js",
-    "/node_modules/b.jsx",
-    "/node_modules/b/index.js",
-    "/node_modules/b/index.jsx"
-  ]
+b: {
+  "resolvedModule": {
+    "resolvedFileName": "/b.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
-c: esnext: {
+c: {
   "failedLookupLocations": [
-    "/package.json",
-    "/node_modules/c/package.json",
-    "/node_modules/c.ts",
-    "/node_modules/c.tsx",
-    "/node_modules/c.d.ts",
-    "/node_modules/c/index.ts",
-    "/node_modules/c/index.tsx",
-    "/node_modules/c/index.d.ts",
+    "/c.ts",
+    "/c.tsx",
+    "/c.d.ts",
     "/node_modules/@types/c/package.json",
     "/node_modules/@types/c.d.ts",
     "/node_modules/@types/c/index.d.ts",
-    "/node_modules/c/package.json",
-    "/node_modules/c.js",
-    "/node_modules/c.jsx",
-    "/node_modules/c/index.js",
-    "/node_modules/c/index.jsx"
+    "/c.js",
+    "/c.jsx"
   ]
 }
 
 
 MissingPaths:: []
 
-a.ts(2,15): error TS2307: Cannot find module 'b' or its corresponding type declarations.
-a.ts(3,31): error TS2307: Cannot find module 'c' or its corresponding type declarations.
+a.ts(2,15): error TS2306: File '/b.ts' is not a module.
+a.ts(3,31): error TS2792: Cannot find module 'c'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/resolvedImports-after-re-using-an-ambient-external-module-declaration.js b/tests/baselines/reference/reuseProgramStructure/resolvedImports-after-re-using-an-ambient-external-module-declaration.js
index ba5527e70717d..51b54c07edd14 100644
--- a/tests/baselines/reference/reuseProgramStructure/resolvedImports-after-re-using-an-ambient-external-module-declaration.js
+++ b/tests/baselines/reference/reuseProgramStructure/resolvedImports-after-re-using-an-ambient-external-module-declaration.js
@@ -4,98 +4,18 @@ File: /home/src/workspaces/project/a.ts
 
 import * as a from "a";
 resolvedModules:
-a: esnext: {
-  "failedLookupLocations": [
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.ts",
-    "/home/src/workspaces/project/node_modules/a.tsx",
-    "/home/src/workspaces/project/node_modules/a.d.ts",
-    "/home/src/workspaces/project/node_modules/a/index.ts",
-    "/home/src/workspaces/project/node_modules/a/index.tsx",
-    "/home/src/workspaces/project/node_modules/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/package.json",
-    "/home/src/workspaces/project/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.ts",
-    "/home/src/workspaces/node_modules/a.tsx",
-    "/home/src/workspaces/node_modules/a.d.ts",
-    "/home/src/workspaces/node_modules/a/index.ts",
-    "/home/src/workspaces/node_modules/a/index.tsx",
-    "/home/src/workspaces/node_modules/a/index.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/package.json",
-    "/home/src/workspaces/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/index.d.ts",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.ts",
-    "/home/src/node_modules/a.tsx",
-    "/home/src/node_modules/a.d.ts",
-    "/home/src/node_modules/a/index.ts",
-    "/home/src/node_modules/a/index.tsx",
-    "/home/src/node_modules/a/index.d.ts",
-    "/home/src/node_modules/@types/a/package.json",
-    "/home/src/node_modules/@types/a.d.ts",
-    "/home/src/node_modules/@types/a/index.d.ts",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.ts",
-    "/home/node_modules/a.tsx",
-    "/home/node_modules/a.d.ts",
-    "/home/node_modules/a/index.ts",
-    "/home/node_modules/a/index.tsx",
-    "/home/node_modules/a/index.d.ts",
-    "/home/node_modules/@types/a/package.json",
-    "/home/node_modules/@types/a.d.ts",
-    "/home/node_modules/@types/a/index.d.ts",
-    "/node_modules/a/package.json",
-    "/node_modules/a.ts",
-    "/node_modules/a.tsx",
-    "/node_modules/a.d.ts",
-    "/node_modules/a/index.ts",
-    "/node_modules/a/index.tsx",
-    "/node_modules/a/index.d.ts",
-    "/node_modules/@types/a/package.json",
-    "/node_modules/@types/a.d.ts",
-    "/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.js",
-    "/home/src/workspaces/project/node_modules/a.jsx",
-    "/home/src/workspaces/project/node_modules/a/index.js",
-    "/home/src/workspaces/project/node_modules/a/index.jsx",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.js",
-    "/home/src/workspaces/node_modules/a.jsx",
-    "/home/src/workspaces/node_modules/a/index.js",
-    "/home/src/workspaces/node_modules/a/index.jsx",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.js",
-    "/home/src/node_modules/a.jsx",
-    "/home/src/node_modules/a/index.js",
-    "/home/src/node_modules/a/index.jsx",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.js",
-    "/home/node_modules/a.jsx",
-    "/home/node_modules/a/index.js",
-    "/home/node_modules/a/index.jsx",
-    "/node_modules/a/package.json",
-    "/node_modules/a.js",
-    "/node_modules/a.jsx",
-    "/node_modules/a/index.js",
-    "/node_modules/a/index.jsx",
-    "/home/src/workspaces/project/types/a.d.ts",
-    "/home/src/workspaces/project/types/a/package.json",
-    "/home/src/workspaces/project/types/a/index.d.ts"
-  ]
+a: {
+  "resolvedModule": {
+    "resolvedFileName": "/home/src/workspaces/project/a.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 
 MissingPaths:: []
 
-home/src/workspaces/project/a.ts(3,20): error TS2307: Cannot find module 'a' or its corresponding type declarations.
 
 
 
@@ -105,97 +25,17 @@ File: /home/src/workspaces/project/a.ts
 
 import * as aa from "a";
 resolvedModules:
-a: esnext: {
-  "failedLookupLocations": [
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.ts",
-    "/home/src/workspaces/project/node_modules/a.tsx",
-    "/home/src/workspaces/project/node_modules/a.d.ts",
-    "/home/src/workspaces/project/node_modules/a/index.ts",
-    "/home/src/workspaces/project/node_modules/a/index.tsx",
-    "/home/src/workspaces/project/node_modules/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/package.json",
-    "/home/src/workspaces/project/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.ts",
-    "/home/src/workspaces/node_modules/a.tsx",
-    "/home/src/workspaces/node_modules/a.d.ts",
-    "/home/src/workspaces/node_modules/a/index.ts",
-    "/home/src/workspaces/node_modules/a/index.tsx",
-    "/home/src/workspaces/node_modules/a/index.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/package.json",
-    "/home/src/workspaces/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/index.d.ts",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.ts",
-    "/home/src/node_modules/a.tsx",
-    "/home/src/node_modules/a.d.ts",
-    "/home/src/node_modules/a/index.ts",
-    "/home/src/node_modules/a/index.tsx",
-    "/home/src/node_modules/a/index.d.ts",
-    "/home/src/node_modules/@types/a/package.json",
-    "/home/src/node_modules/@types/a.d.ts",
-    "/home/src/node_modules/@types/a/index.d.ts",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.ts",
-    "/home/node_modules/a.tsx",
-    "/home/node_modules/a.d.ts",
-    "/home/node_modules/a/index.ts",
-    "/home/node_modules/a/index.tsx",
-    "/home/node_modules/a/index.d.ts",
-    "/home/node_modules/@types/a/package.json",
-    "/home/node_modules/@types/a.d.ts",
-    "/home/node_modules/@types/a/index.d.ts",
-    "/node_modules/a/package.json",
-    "/node_modules/a.ts",
-    "/node_modules/a.tsx",
-    "/node_modules/a.d.ts",
-    "/node_modules/a/index.ts",
-    "/node_modules/a/index.tsx",
-    "/node_modules/a/index.d.ts",
-    "/node_modules/@types/a/package.json",
-    "/node_modules/@types/a.d.ts",
-    "/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.js",
-    "/home/src/workspaces/project/node_modules/a.jsx",
-    "/home/src/workspaces/project/node_modules/a/index.js",
-    "/home/src/workspaces/project/node_modules/a/index.jsx",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.js",
-    "/home/src/workspaces/node_modules/a.jsx",
-    "/home/src/workspaces/node_modules/a/index.js",
-    "/home/src/workspaces/node_modules/a/index.jsx",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.js",
-    "/home/src/node_modules/a.jsx",
-    "/home/src/node_modules/a/index.js",
-    "/home/src/node_modules/a/index.jsx",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.js",
-    "/home/node_modules/a.jsx",
-    "/home/node_modules/a/index.js",
-    "/home/node_modules/a/index.jsx",
-    "/node_modules/a/package.json",
-    "/node_modules/a.js",
-    "/node_modules/a.jsx",
-    "/node_modules/a/index.js",
-    "/node_modules/a/index.jsx",
-    "/home/src/workspaces/project/types/a.d.ts",
-    "/home/src/workspaces/project/types/a/package.json",
-    "/home/src/workspaces/project/types/a/index.d.ts"
-  ]
+a: {
+  "resolvedModule": {
+    "resolvedFileName": "/home/src/workspaces/project/a.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 
 MissingPaths:: []
 
-home/src/workspaces/project/a.ts(3,21): error TS2307: Cannot find module 'a' or its corresponding type declarations.
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/should-not-reuse-ambient-module-declarations-from-non-modified-files.js b/tests/baselines/reference/reuseProgramStructure/should-not-reuse-ambient-module-declarations-from-non-modified-files.js
index e5236c9c090a2..3d250f8ace258 100644
--- a/tests/baselines/reference/reuseProgramStructure/should-not-reuse-ambient-module-declarations-from-non-modified-files.js
+++ b/tests/baselines/reference/reuseProgramStructure/should-not-reuse-ambient-module-declarations-from-non-modified-files.js
@@ -4,120 +4,64 @@ File: /home/src/workspaces/project/a/b/app.ts
 import * as fs from 'fs'
 
 resolvedModules:
-fs: esnext: {
+fs: {
   "failedLookupLocations": [
-    "/home/src/workspaces/project/a/b/package.json",
-    "/home/src/workspaces/project/a/package.json",
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs.tsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.d.ts",
+    "/home/src/workspaces/project/a/b/fs.ts",
+    "/home/src/workspaces/project/a/b/fs.tsx",
+    "/home/src/workspaces/project/a/b/fs.d.ts",
+    "/home/src/workspaces/project/a/fs.ts",
+    "/home/src/workspaces/project/a/fs.tsx",
+    "/home/src/workspaces/project/a/fs.d.ts",
+    "/home/src/workspaces/project/fs.ts",
+    "/home/src/workspaces/project/fs.tsx",
+    "/home/src/workspaces/project/fs.d.ts",
+    "/home/src/workspaces/fs.ts",
+    "/home/src/workspaces/fs.tsx",
+    "/home/src/workspaces/fs.d.ts",
+    "/home/src/fs.ts",
+    "/home/src/fs.tsx",
+    "/home/src/fs.d.ts",
+    "/home/fs.ts",
+    "/home/fs.tsx",
+    "/home/fs.d.ts",
+    "/fs.ts",
+    "/fs.tsx",
+    "/fs.d.ts",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/node_modules/fs.ts",
-    "/home/src/workspaces/project/a/node_modules/fs.tsx",
-    "/home/src/workspaces/project/a/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/a/node_modules/fs/index.d.ts",
     "/home/src/workspaces/project/a/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/a/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/a/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/node_modules/fs/package.json",
-    "/home/src/workspaces/project/node_modules/fs.ts",
-    "/home/src/workspaces/project/node_modules/fs.tsx",
-    "/home/src/workspaces/project/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/node_modules/fs/index.d.ts",
     "/home/src/workspaces/project/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/node_modules/fs/package.json",
-    "/home/src/workspaces/node_modules/fs.ts",
-    "/home/src/workspaces/node_modules/fs.tsx",
-    "/home/src/workspaces/node_modules/fs.d.ts",
-    "/home/src/workspaces/node_modules/fs/index.ts",
-    "/home/src/workspaces/node_modules/fs/index.tsx",
-    "/home/src/workspaces/node_modules/fs/index.d.ts",
     "/home/src/workspaces/node_modules/@types/fs/package.json",
     "/home/src/workspaces/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/node_modules/@types/fs/index.d.ts",
-    "/home/src/node_modules/fs/package.json",
-    "/home/src/node_modules/fs.ts",
-    "/home/src/node_modules/fs.tsx",
-    "/home/src/node_modules/fs.d.ts",
-    "/home/src/node_modules/fs/index.ts",
-    "/home/src/node_modules/fs/index.tsx",
-    "/home/src/node_modules/fs/index.d.ts",
     "/home/src/node_modules/@types/fs/package.json",
     "/home/src/node_modules/@types/fs.d.ts",
     "/home/src/node_modules/@types/fs/index.d.ts",
-    "/home/node_modules/fs/package.json",
-    "/home/node_modules/fs.ts",
-    "/home/node_modules/fs.tsx",
-    "/home/node_modules/fs.d.ts",
-    "/home/node_modules/fs/index.ts",
-    "/home/node_modules/fs/index.tsx",
-    "/home/node_modules/fs/index.d.ts",
     "/home/node_modules/@types/fs/package.json",
     "/home/node_modules/@types/fs.d.ts",
     "/home/node_modules/@types/fs/index.d.ts",
-    "/node_modules/fs/package.json",
-    "/node_modules/fs.ts",
-    "/node_modules/fs.tsx",
-    "/node_modules/fs.d.ts",
-    "/node_modules/fs/index.ts",
-    "/node_modules/fs/index.tsx",
-    "/node_modules/fs/index.d.ts",
     "/node_modules/@types/fs/package.json",
     "/node_modules/@types/fs.d.ts",
     "/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs.js",
-    "/home/src/workspaces/project/a/b/node_modules/fs.jsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.js",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.jsx",
-    "/home/src/workspaces/project/a/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/node_modules/fs.js",
-    "/home/src/workspaces/project/a/node_modules/fs.jsx",
-    "/home/src/workspaces/project/a/node_modules/fs/index.js",
-    "/home/src/workspaces/project/a/node_modules/fs/index.jsx",
-    "/home/src/workspaces/project/node_modules/fs/package.json",
-    "/home/src/workspaces/project/node_modules/fs.js",
-    "/home/src/workspaces/project/node_modules/fs.jsx",
-    "/home/src/workspaces/project/node_modules/fs/index.js",
-    "/home/src/workspaces/project/node_modules/fs/index.jsx",
-    "/home/src/workspaces/node_modules/fs/package.json",
-    "/home/src/workspaces/node_modules/fs.js",
-    "/home/src/workspaces/node_modules/fs.jsx",
-    "/home/src/workspaces/node_modules/fs/index.js",
-    "/home/src/workspaces/node_modules/fs/index.jsx",
-    "/home/src/node_modules/fs/package.json",
-    "/home/src/node_modules/fs.js",
-    "/home/src/node_modules/fs.jsx",
-    "/home/src/node_modules/fs/index.js",
-    "/home/src/node_modules/fs/index.jsx",
-    "/home/node_modules/fs/package.json",
-    "/home/node_modules/fs.js",
-    "/home/node_modules/fs.jsx",
-    "/home/node_modules/fs/index.js",
-    "/home/node_modules/fs/index.jsx",
-    "/node_modules/fs/package.json",
-    "/node_modules/fs.js",
-    "/node_modules/fs.jsx",
-    "/node_modules/fs/index.js",
-    "/node_modules/fs/index.jsx"
+    "/home/src/workspaces/project/a/b/fs.js",
+    "/home/src/workspaces/project/a/b/fs.jsx",
+    "/home/src/workspaces/project/a/fs.js",
+    "/home/src/workspaces/project/a/fs.jsx",
+    "/home/src/workspaces/project/fs.js",
+    "/home/src/workspaces/project/fs.jsx",
+    "/home/src/workspaces/fs.js",
+    "/home/src/workspaces/fs.jsx",
+    "/home/src/fs.js",
+    "/home/src/fs.jsx",
+    "/home/fs.js",
+    "/home/fs.jsx",
+    "/fs.js",
+    "/fs.jsx"
   ]
 }
 
@@ -127,123 +71,64 @@ File: /home/src/workspaces/project/a/b/node.d.ts
 declare module 'fs' {}
 
 ======== Resolving module 'fs' from '/home/src/workspaces/project/a/b/app.ts'. ========
-Module resolution kind is not specified, using 'Bundler'.
-Resolving in CJS mode with conditions 'import', 'types'.
-File '/home/src/workspaces/project/a/b/package.json' does not exist.
-File '/home/src/workspaces/project/a/package.json' does not exist.
-File '/home/src/workspaces/project/package.json' does not exist.
-File '/home/src/workspaces/package.json' does not exist.
-File '/home/src/package.json' does not exist.
-File '/home/package.json' does not exist.
-File '/package.json' does not exist.
-Loading module 'fs' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.
-Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.
-File '/home/src/workspaces/project/a/b/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.d.ts' does not exist.
+Module resolution kind is not specified, using 'Classic'.
+File '/home/src/workspaces/project/a/b/fs.ts' does not exist.
+File '/home/src/workspaces/project/a/b/fs.tsx' does not exist.
+File '/home/src/workspaces/project/a/b/fs.d.ts' does not exist.
+File '/home/src/workspaces/project/a/fs.ts' does not exist.
+File '/home/src/workspaces/project/a/fs.tsx' does not exist.
+File '/home/src/workspaces/project/a/fs.d.ts' does not exist.
+File '/home/src/workspaces/project/fs.ts' does not exist.
+File '/home/src/workspaces/project/fs.tsx' does not exist.
+File '/home/src/workspaces/project/fs.d.ts' does not exist.
+File '/home/src/workspaces/fs.ts' does not exist.
+File '/home/src/workspaces/fs.tsx' does not exist.
+File '/home/src/workspaces/fs.d.ts' does not exist.
+File '/home/src/fs.ts' does not exist.
+File '/home/src/fs.tsx' does not exist.
+File '/home/src/fs.d.ts' does not exist.
+File '/home/fs.ts' does not exist.
+File '/home/fs.tsx' does not exist.
+File '/home/fs.d.ts' does not exist.
+File '/fs.ts' does not exist.
+File '/fs.tsx' does not exist.
+File '/fs.d.ts' does not exist.
+Searching all ancestor node_modules directories for preferred extensions: Declaration.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/node_modules/fs/package.json' does not exist.
-File '/home/src/node_modules/fs.ts' does not exist.
-File '/home/src/node_modules/fs.tsx' does not exist.
-File '/home/src/node_modules/fs.d.ts' does not exist.
-File '/home/src/node_modules/fs/index.ts' does not exist.
-File '/home/src/node_modules/fs/index.tsx' does not exist.
-File '/home/src/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/node_modules/fs/package.json' does not exist.
-File '/home/node_modules/fs.ts' does not exist.
-File '/home/node_modules/fs.tsx' does not exist.
-File '/home/node_modules/fs.d.ts' does not exist.
-File '/home/node_modules/fs/index.ts' does not exist.
-File '/home/node_modules/fs/index.tsx' does not exist.
-File '/home/node_modules/fs/index.d.ts' does not exist.
 File '/home/node_modules/@types/fs/package.json' does not exist.
 File '/home/node_modules/@types/fs.d.ts' does not exist.
 File '/home/node_modules/@types/fs/index.d.ts' does not exist.
-File '/node_modules/fs/package.json' does not exist.
-File '/node_modules/fs.ts' does not exist.
-File '/node_modules/fs.tsx' does not exist.
-File '/node_modules/fs.d.ts' does not exist.
-File '/node_modules/fs/index.ts' does not exist.
-File '/node_modules/fs/index.tsx' does not exist.
-File '/node_modules/fs/index.d.ts' does not exist.
 File '/node_modules/@types/fs/package.json' does not exist.
 File '/node_modules/@types/fs.d.ts' does not exist.
 File '/node_modules/@types/fs/index.d.ts' does not exist.
-Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON.
-File '/home/src/workspaces/project/a/b/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/a/b/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/a/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.jsx' does not exist.
-File '/home/src/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/node_modules/fs.js' does not exist.
-File '/home/src/node_modules/fs.jsx' does not exist.
-File '/home/src/node_modules/fs/index.js' does not exist.
-File '/home/src/node_modules/fs/index.jsx' does not exist.
-File '/home/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/node_modules/fs.js' does not exist.
-File '/home/node_modules/fs.jsx' does not exist.
-File '/home/node_modules/fs/index.js' does not exist.
-File '/home/node_modules/fs/index.jsx' does not exist.
-File '/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/node_modules/fs.js' does not exist.
-File '/node_modules/fs.jsx' does not exist.
-File '/node_modules/fs/index.js' does not exist.
-File '/node_modules/fs/index.jsx' does not exist.
+File '/home/src/workspaces/project/a/b/fs.js' does not exist.
+File '/home/src/workspaces/project/a/b/fs.jsx' does not exist.
+File '/home/src/workspaces/project/a/fs.js' does not exist.
+File '/home/src/workspaces/project/a/fs.jsx' does not exist.
+File '/home/src/workspaces/project/fs.js' does not exist.
+File '/home/src/workspaces/project/fs.jsx' does not exist.
+File '/home/src/workspaces/fs.js' does not exist.
+File '/home/src/workspaces/fs.jsx' does not exist.
+File '/home/src/fs.js' does not exist.
+File '/home/src/fs.jsx' does not exist.
+File '/home/fs.js' does not exist.
+File '/home/fs.jsx' does not exist.
+File '/fs.js' does not exist.
+File '/fs.jsx' does not exist.
 ======== Module name 'fs' was not resolved. ========
 
 MissingPaths:: []
@@ -257,120 +142,64 @@ File: /home/src/workspaces/project/a/b/app.ts
 import * as fs from 'fs'
 var x = 1;
 resolvedModules:
-fs: esnext: {
+fs: {
   "failedLookupLocations": [
-    "/home/src/workspaces/project/a/b/package.json",
-    "/home/src/workspaces/project/a/package.json",
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs.tsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.d.ts",
+    "/home/src/workspaces/project/a/b/fs.ts",
+    "/home/src/workspaces/project/a/b/fs.tsx",
+    "/home/src/workspaces/project/a/b/fs.d.ts",
+    "/home/src/workspaces/project/a/fs.ts",
+    "/home/src/workspaces/project/a/fs.tsx",
+    "/home/src/workspaces/project/a/fs.d.ts",
+    "/home/src/workspaces/project/fs.ts",
+    "/home/src/workspaces/project/fs.tsx",
+    "/home/src/workspaces/project/fs.d.ts",
+    "/home/src/workspaces/fs.ts",
+    "/home/src/workspaces/fs.tsx",
+    "/home/src/workspaces/fs.d.ts",
+    "/home/src/fs.ts",
+    "/home/src/fs.tsx",
+    "/home/src/fs.d.ts",
+    "/home/fs.ts",
+    "/home/fs.tsx",
+    "/home/fs.d.ts",
+    "/fs.ts",
+    "/fs.tsx",
+    "/fs.d.ts",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/node_modules/fs.ts",
-    "/home/src/workspaces/project/a/node_modules/fs.tsx",
-    "/home/src/workspaces/project/a/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/a/node_modules/fs/index.d.ts",
     "/home/src/workspaces/project/a/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/a/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/a/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/node_modules/fs/package.json",
-    "/home/src/workspaces/project/node_modules/fs.ts",
-    "/home/src/workspaces/project/node_modules/fs.tsx",
-    "/home/src/workspaces/project/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/node_modules/fs/index.d.ts",
     "/home/src/workspaces/project/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/node_modules/fs/package.json",
-    "/home/src/workspaces/node_modules/fs.ts",
-    "/home/src/workspaces/node_modules/fs.tsx",
-    "/home/src/workspaces/node_modules/fs.d.ts",
-    "/home/src/workspaces/node_modules/fs/index.ts",
-    "/home/src/workspaces/node_modules/fs/index.tsx",
-    "/home/src/workspaces/node_modules/fs/index.d.ts",
     "/home/src/workspaces/node_modules/@types/fs/package.json",
     "/home/src/workspaces/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/node_modules/@types/fs/index.d.ts",
-    "/home/src/node_modules/fs/package.json",
-    "/home/src/node_modules/fs.ts",
-    "/home/src/node_modules/fs.tsx",
-    "/home/src/node_modules/fs.d.ts",
-    "/home/src/node_modules/fs/index.ts",
-    "/home/src/node_modules/fs/index.tsx",
-    "/home/src/node_modules/fs/index.d.ts",
     "/home/src/node_modules/@types/fs/package.json",
     "/home/src/node_modules/@types/fs.d.ts",
     "/home/src/node_modules/@types/fs/index.d.ts",
-    "/home/node_modules/fs/package.json",
-    "/home/node_modules/fs.ts",
-    "/home/node_modules/fs.tsx",
-    "/home/node_modules/fs.d.ts",
-    "/home/node_modules/fs/index.ts",
-    "/home/node_modules/fs/index.tsx",
-    "/home/node_modules/fs/index.d.ts",
     "/home/node_modules/@types/fs/package.json",
     "/home/node_modules/@types/fs.d.ts",
     "/home/node_modules/@types/fs/index.d.ts",
-    "/node_modules/fs/package.json",
-    "/node_modules/fs.ts",
-    "/node_modules/fs.tsx",
-    "/node_modules/fs.d.ts",
-    "/node_modules/fs/index.ts",
-    "/node_modules/fs/index.tsx",
-    "/node_modules/fs/index.d.ts",
     "/node_modules/@types/fs/package.json",
     "/node_modules/@types/fs.d.ts",
     "/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs.js",
-    "/home/src/workspaces/project/a/b/node_modules/fs.jsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.js",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.jsx",
-    "/home/src/workspaces/project/a/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/node_modules/fs.js",
-    "/home/src/workspaces/project/a/node_modules/fs.jsx",
-    "/home/src/workspaces/project/a/node_modules/fs/index.js",
-    "/home/src/workspaces/project/a/node_modules/fs/index.jsx",
-    "/home/src/workspaces/project/node_modules/fs/package.json",
-    "/home/src/workspaces/project/node_modules/fs.js",
-    "/home/src/workspaces/project/node_modules/fs.jsx",
-    "/home/src/workspaces/project/node_modules/fs/index.js",
-    "/home/src/workspaces/project/node_modules/fs/index.jsx",
-    "/home/src/workspaces/node_modules/fs/package.json",
-    "/home/src/workspaces/node_modules/fs.js",
-    "/home/src/workspaces/node_modules/fs.jsx",
-    "/home/src/workspaces/node_modules/fs/index.js",
-    "/home/src/workspaces/node_modules/fs/index.jsx",
-    "/home/src/node_modules/fs/package.json",
-    "/home/src/node_modules/fs.js",
-    "/home/src/node_modules/fs.jsx",
-    "/home/src/node_modules/fs/index.js",
-    "/home/src/node_modules/fs/index.jsx",
-    "/home/node_modules/fs/package.json",
-    "/home/node_modules/fs.js",
-    "/home/node_modules/fs.jsx",
-    "/home/node_modules/fs/index.js",
-    "/home/node_modules/fs/index.jsx",
-    "/node_modules/fs/package.json",
-    "/node_modules/fs.js",
-    "/node_modules/fs.jsx",
-    "/node_modules/fs/index.js",
-    "/node_modules/fs/index.jsx"
+    "/home/src/workspaces/project/a/b/fs.js",
+    "/home/src/workspaces/project/a/b/fs.jsx",
+    "/home/src/workspaces/project/a/fs.js",
+    "/home/src/workspaces/project/a/fs.jsx",
+    "/home/src/workspaces/project/fs.js",
+    "/home/src/workspaces/project/fs.jsx",
+    "/home/src/workspaces/fs.js",
+    "/home/src/workspaces/fs.jsx",
+    "/home/src/fs.js",
+    "/home/src/fs.jsx",
+    "/home/fs.js",
+    "/home/fs.jsx",
+    "/fs.js",
+    "/fs.jsx"
   ]
 }
 
@@ -380,123 +209,64 @@ File: /home/src/workspaces/project/a/b/node.d.ts
 declare module 'fs' {}
 
 ======== Resolving module 'fs' from '/home/src/workspaces/project/a/b/app.ts'. ========
-Module resolution kind is not specified, using 'Bundler'.
-Resolving in CJS mode with conditions 'import', 'types'.
-File '/home/src/workspaces/project/a/b/package.json' does not exist.
-File '/home/src/workspaces/project/a/package.json' does not exist.
-File '/home/src/workspaces/project/package.json' does not exist.
-File '/home/src/workspaces/package.json' does not exist.
-File '/home/src/package.json' does not exist.
-File '/home/package.json' does not exist.
-File '/package.json' does not exist.
-Loading module 'fs' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.
-Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.
-File '/home/src/workspaces/project/a/b/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.d.ts' does not exist.
+Module resolution kind is not specified, using 'Classic'.
+File '/home/src/workspaces/project/a/b/fs.ts' does not exist.
+File '/home/src/workspaces/project/a/b/fs.tsx' does not exist.
+File '/home/src/workspaces/project/a/b/fs.d.ts' does not exist.
+File '/home/src/workspaces/project/a/fs.ts' does not exist.
+File '/home/src/workspaces/project/a/fs.tsx' does not exist.
+File '/home/src/workspaces/project/a/fs.d.ts' does not exist.
+File '/home/src/workspaces/project/fs.ts' does not exist.
+File '/home/src/workspaces/project/fs.tsx' does not exist.
+File '/home/src/workspaces/project/fs.d.ts' does not exist.
+File '/home/src/workspaces/fs.ts' does not exist.
+File '/home/src/workspaces/fs.tsx' does not exist.
+File '/home/src/workspaces/fs.d.ts' does not exist.
+File '/home/src/fs.ts' does not exist.
+File '/home/src/fs.tsx' does not exist.
+File '/home/src/fs.d.ts' does not exist.
+File '/home/fs.ts' does not exist.
+File '/home/fs.tsx' does not exist.
+File '/home/fs.d.ts' does not exist.
+File '/fs.ts' does not exist.
+File '/fs.tsx' does not exist.
+File '/fs.d.ts' does not exist.
+Searching all ancestor node_modules directories for preferred extensions: Declaration.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/node_modules/fs/package.json' does not exist.
-File '/home/src/node_modules/fs.ts' does not exist.
-File '/home/src/node_modules/fs.tsx' does not exist.
-File '/home/src/node_modules/fs.d.ts' does not exist.
-File '/home/src/node_modules/fs/index.ts' does not exist.
-File '/home/src/node_modules/fs/index.tsx' does not exist.
-File '/home/src/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/node_modules/fs/package.json' does not exist.
-File '/home/node_modules/fs.ts' does not exist.
-File '/home/node_modules/fs.tsx' does not exist.
-File '/home/node_modules/fs.d.ts' does not exist.
-File '/home/node_modules/fs/index.ts' does not exist.
-File '/home/node_modules/fs/index.tsx' does not exist.
-File '/home/node_modules/fs/index.d.ts' does not exist.
 File '/home/node_modules/@types/fs/package.json' does not exist.
 File '/home/node_modules/@types/fs.d.ts' does not exist.
 File '/home/node_modules/@types/fs/index.d.ts' does not exist.
-File '/node_modules/fs/package.json' does not exist.
-File '/node_modules/fs.ts' does not exist.
-File '/node_modules/fs.tsx' does not exist.
-File '/node_modules/fs.d.ts' does not exist.
-File '/node_modules/fs/index.ts' does not exist.
-File '/node_modules/fs/index.tsx' does not exist.
-File '/node_modules/fs/index.d.ts' does not exist.
 File '/node_modules/@types/fs/package.json' does not exist.
 File '/node_modules/@types/fs.d.ts' does not exist.
 File '/node_modules/@types/fs/index.d.ts' does not exist.
-Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON.
-File '/home/src/workspaces/project/a/b/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/a/b/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/a/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.jsx' does not exist.
-File '/home/src/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/node_modules/fs.js' does not exist.
-File '/home/src/node_modules/fs.jsx' does not exist.
-File '/home/src/node_modules/fs/index.js' does not exist.
-File '/home/src/node_modules/fs/index.jsx' does not exist.
-File '/home/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/node_modules/fs.js' does not exist.
-File '/home/node_modules/fs.jsx' does not exist.
-File '/home/node_modules/fs/index.js' does not exist.
-File '/home/node_modules/fs/index.jsx' does not exist.
-File '/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/node_modules/fs.js' does not exist.
-File '/node_modules/fs.jsx' does not exist.
-File '/node_modules/fs/index.js' does not exist.
-File '/node_modules/fs/index.jsx' does not exist.
+File '/home/src/workspaces/project/a/b/fs.js' does not exist.
+File '/home/src/workspaces/project/a/b/fs.jsx' does not exist.
+File '/home/src/workspaces/project/a/fs.js' does not exist.
+File '/home/src/workspaces/project/a/fs.jsx' does not exist.
+File '/home/src/workspaces/project/fs.js' does not exist.
+File '/home/src/workspaces/project/fs.jsx' does not exist.
+File '/home/src/workspaces/fs.js' does not exist.
+File '/home/src/workspaces/fs.jsx' does not exist.
+File '/home/src/fs.js' does not exist.
+File '/home/src/fs.jsx' does not exist.
+File '/home/fs.js' does not exist.
+File '/home/fs.jsx' does not exist.
+File '/fs.js' does not exist.
+File '/fs.jsx' does not exist.
 ======== Module name 'fs' was not resolved. ========
 
 MissingPaths:: []
@@ -510,120 +280,64 @@ File: /home/src/workspaces/project/a/b/app.ts
 import * as fs from 'fs'
 var y = 1;
 resolvedModules:
-fs: esnext: {
+fs: {
   "failedLookupLocations": [
-    "/home/src/workspaces/project/a/b/package.json",
-    "/home/src/workspaces/project/a/package.json",
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs.tsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.d.ts",
+    "/home/src/workspaces/project/a/b/fs.ts",
+    "/home/src/workspaces/project/a/b/fs.tsx",
+    "/home/src/workspaces/project/a/b/fs.d.ts",
+    "/home/src/workspaces/project/a/fs.ts",
+    "/home/src/workspaces/project/a/fs.tsx",
+    "/home/src/workspaces/project/a/fs.d.ts",
+    "/home/src/workspaces/project/fs.ts",
+    "/home/src/workspaces/project/fs.tsx",
+    "/home/src/workspaces/project/fs.d.ts",
+    "/home/src/workspaces/fs.ts",
+    "/home/src/workspaces/fs.tsx",
+    "/home/src/workspaces/fs.d.ts",
+    "/home/src/fs.ts",
+    "/home/src/fs.tsx",
+    "/home/src/fs.d.ts",
+    "/home/fs.ts",
+    "/home/fs.tsx",
+    "/home/fs.d.ts",
+    "/fs.ts",
+    "/fs.tsx",
+    "/fs.d.ts",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/a/b/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/node_modules/fs.ts",
-    "/home/src/workspaces/project/a/node_modules/fs.tsx",
-    "/home/src/workspaces/project/a/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/a/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/a/node_modules/fs/index.d.ts",
     "/home/src/workspaces/project/a/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/a/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/a/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/node_modules/fs/package.json",
-    "/home/src/workspaces/project/node_modules/fs.ts",
-    "/home/src/workspaces/project/node_modules/fs.tsx",
-    "/home/src/workspaces/project/node_modules/fs.d.ts",
-    "/home/src/workspaces/project/node_modules/fs/index.ts",
-    "/home/src/workspaces/project/node_modules/fs/index.tsx",
-    "/home/src/workspaces/project/node_modules/fs/index.d.ts",
     "/home/src/workspaces/project/node_modules/@types/fs/package.json",
     "/home/src/workspaces/project/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/project/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/node_modules/fs/package.json",
-    "/home/src/workspaces/node_modules/fs.ts",
-    "/home/src/workspaces/node_modules/fs.tsx",
-    "/home/src/workspaces/node_modules/fs.d.ts",
-    "/home/src/workspaces/node_modules/fs/index.ts",
-    "/home/src/workspaces/node_modules/fs/index.tsx",
-    "/home/src/workspaces/node_modules/fs/index.d.ts",
     "/home/src/workspaces/node_modules/@types/fs/package.json",
     "/home/src/workspaces/node_modules/@types/fs.d.ts",
     "/home/src/workspaces/node_modules/@types/fs/index.d.ts",
-    "/home/src/node_modules/fs/package.json",
-    "/home/src/node_modules/fs.ts",
-    "/home/src/node_modules/fs.tsx",
-    "/home/src/node_modules/fs.d.ts",
-    "/home/src/node_modules/fs/index.ts",
-    "/home/src/node_modules/fs/index.tsx",
-    "/home/src/node_modules/fs/index.d.ts",
     "/home/src/node_modules/@types/fs/package.json",
     "/home/src/node_modules/@types/fs.d.ts",
     "/home/src/node_modules/@types/fs/index.d.ts",
-    "/home/node_modules/fs/package.json",
-    "/home/node_modules/fs.ts",
-    "/home/node_modules/fs.tsx",
-    "/home/node_modules/fs.d.ts",
-    "/home/node_modules/fs/index.ts",
-    "/home/node_modules/fs/index.tsx",
-    "/home/node_modules/fs/index.d.ts",
     "/home/node_modules/@types/fs/package.json",
     "/home/node_modules/@types/fs.d.ts",
     "/home/node_modules/@types/fs/index.d.ts",
-    "/node_modules/fs/package.json",
-    "/node_modules/fs.ts",
-    "/node_modules/fs.tsx",
-    "/node_modules/fs.d.ts",
-    "/node_modules/fs/index.ts",
-    "/node_modules/fs/index.tsx",
-    "/node_modules/fs/index.d.ts",
     "/node_modules/@types/fs/package.json",
     "/node_modules/@types/fs.d.ts",
     "/node_modules/@types/fs/index.d.ts",
-    "/home/src/workspaces/project/a/b/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/b/node_modules/fs.js",
-    "/home/src/workspaces/project/a/b/node_modules/fs.jsx",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.js",
-    "/home/src/workspaces/project/a/b/node_modules/fs/index.jsx",
-    "/home/src/workspaces/project/a/node_modules/fs/package.json",
-    "/home/src/workspaces/project/a/node_modules/fs.js",
-    "/home/src/workspaces/project/a/node_modules/fs.jsx",
-    "/home/src/workspaces/project/a/node_modules/fs/index.js",
-    "/home/src/workspaces/project/a/node_modules/fs/index.jsx",
-    "/home/src/workspaces/project/node_modules/fs/package.json",
-    "/home/src/workspaces/project/node_modules/fs.js",
-    "/home/src/workspaces/project/node_modules/fs.jsx",
-    "/home/src/workspaces/project/node_modules/fs/index.js",
-    "/home/src/workspaces/project/node_modules/fs/index.jsx",
-    "/home/src/workspaces/node_modules/fs/package.json",
-    "/home/src/workspaces/node_modules/fs.js",
-    "/home/src/workspaces/node_modules/fs.jsx",
-    "/home/src/workspaces/node_modules/fs/index.js",
-    "/home/src/workspaces/node_modules/fs/index.jsx",
-    "/home/src/node_modules/fs/package.json",
-    "/home/src/node_modules/fs.js",
-    "/home/src/node_modules/fs.jsx",
-    "/home/src/node_modules/fs/index.js",
-    "/home/src/node_modules/fs/index.jsx",
-    "/home/node_modules/fs/package.json",
-    "/home/node_modules/fs.js",
-    "/home/node_modules/fs.jsx",
-    "/home/node_modules/fs/index.js",
-    "/home/node_modules/fs/index.jsx",
-    "/node_modules/fs/package.json",
-    "/node_modules/fs.js",
-    "/node_modules/fs.jsx",
-    "/node_modules/fs/index.js",
-    "/node_modules/fs/index.jsx"
+    "/home/src/workspaces/project/a/b/fs.js",
+    "/home/src/workspaces/project/a/b/fs.jsx",
+    "/home/src/workspaces/project/a/fs.js",
+    "/home/src/workspaces/project/a/fs.jsx",
+    "/home/src/workspaces/project/fs.js",
+    "/home/src/workspaces/project/fs.jsx",
+    "/home/src/workspaces/fs.js",
+    "/home/src/workspaces/fs.jsx",
+    "/home/src/fs.js",
+    "/home/src/fs.jsx",
+    "/home/fs.js",
+    "/home/fs.jsx",
+    "/fs.js",
+    "/fs.jsx"
   ]
 }
 
@@ -633,127 +347,68 @@ File: /home/src/workspaces/project/a/b/node.d.ts
 declare var process: any
 
 ======== Resolving module 'fs' from '/home/src/workspaces/project/a/b/app.ts'. ========
-Module resolution kind is not specified, using 'Bundler'.
-Resolving in CJS mode with conditions 'import', 'types'.
-File '/home/src/workspaces/project/a/b/package.json' does not exist.
-File '/home/src/workspaces/project/a/package.json' does not exist.
-File '/home/src/workspaces/project/package.json' does not exist.
-File '/home/src/workspaces/package.json' does not exist.
-File '/home/src/package.json' does not exist.
-File '/home/package.json' does not exist.
-File '/package.json' does not exist.
-Loading module 'fs' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.
-Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.
-File '/home/src/workspaces/project/a/b/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.d.ts' does not exist.
+Module resolution kind is not specified, using 'Classic'.
+File '/home/src/workspaces/project/a/b/fs.ts' does not exist.
+File '/home/src/workspaces/project/a/b/fs.tsx' does not exist.
+File '/home/src/workspaces/project/a/b/fs.d.ts' does not exist.
+File '/home/src/workspaces/project/a/fs.ts' does not exist.
+File '/home/src/workspaces/project/a/fs.tsx' does not exist.
+File '/home/src/workspaces/project/a/fs.d.ts' does not exist.
+File '/home/src/workspaces/project/fs.ts' does not exist.
+File '/home/src/workspaces/project/fs.tsx' does not exist.
+File '/home/src/workspaces/project/fs.d.ts' does not exist.
+File '/home/src/workspaces/fs.ts' does not exist.
+File '/home/src/workspaces/fs.tsx' does not exist.
+File '/home/src/workspaces/fs.d.ts' does not exist.
+File '/home/src/fs.ts' does not exist.
+File '/home/src/fs.tsx' does not exist.
+File '/home/src/fs.d.ts' does not exist.
+File '/home/fs.ts' does not exist.
+File '/home/fs.tsx' does not exist.
+File '/home/fs.d.ts' does not exist.
+File '/fs.ts' does not exist.
+File '/fs.tsx' does not exist.
+File '/fs.d.ts' does not exist.
+Searching all ancestor node_modules directories for preferred extensions: Declaration.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/a/b/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/a/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/project/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/package.json' does not exist.
-File '/home/src/workspaces/node_modules/fs.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs.tsx' does not exist.
-File '/home/src/workspaces/node_modules/fs.d.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.ts' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.tsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/workspaces/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/src/node_modules/fs/package.json' does not exist.
-File '/home/src/node_modules/fs.ts' does not exist.
-File '/home/src/node_modules/fs.tsx' does not exist.
-File '/home/src/node_modules/fs.d.ts' does not exist.
-File '/home/src/node_modules/fs/index.ts' does not exist.
-File '/home/src/node_modules/fs/index.tsx' does not exist.
-File '/home/src/node_modules/fs/index.d.ts' does not exist.
 File '/home/src/node_modules/@types/fs/package.json' does not exist.
 File '/home/src/node_modules/@types/fs.d.ts' does not exist.
 File '/home/src/node_modules/@types/fs/index.d.ts' does not exist.
-File '/home/node_modules/fs/package.json' does not exist.
-File '/home/node_modules/fs.ts' does not exist.
-File '/home/node_modules/fs.tsx' does not exist.
-File '/home/node_modules/fs.d.ts' does not exist.
-File '/home/node_modules/fs/index.ts' does not exist.
-File '/home/node_modules/fs/index.tsx' does not exist.
-File '/home/node_modules/fs/index.d.ts' does not exist.
 File '/home/node_modules/@types/fs/package.json' does not exist.
 File '/home/node_modules/@types/fs.d.ts' does not exist.
 File '/home/node_modules/@types/fs/index.d.ts' does not exist.
-File '/node_modules/fs/package.json' does not exist.
-File '/node_modules/fs.ts' does not exist.
-File '/node_modules/fs.tsx' does not exist.
-File '/node_modules/fs.d.ts' does not exist.
-File '/node_modules/fs/index.ts' does not exist.
-File '/node_modules/fs/index.tsx' does not exist.
-File '/node_modules/fs/index.d.ts' does not exist.
 File '/node_modules/@types/fs/package.json' does not exist.
 File '/node_modules/@types/fs.d.ts' does not exist.
 File '/node_modules/@types/fs/index.d.ts' does not exist.
-Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON.
-File '/home/src/workspaces/project/a/b/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/a/b/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/a/b/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/a/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/a/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/project/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/project/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/project/node_modules/fs/index.jsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/workspaces/node_modules/fs.js' does not exist.
-File '/home/src/workspaces/node_modules/fs.jsx' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.js' does not exist.
-File '/home/src/workspaces/node_modules/fs/index.jsx' does not exist.
-File '/home/src/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/src/node_modules/fs.js' does not exist.
-File '/home/src/node_modules/fs.jsx' does not exist.
-File '/home/src/node_modules/fs/index.js' does not exist.
-File '/home/src/node_modules/fs/index.jsx' does not exist.
-File '/home/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/home/node_modules/fs.js' does not exist.
-File '/home/node_modules/fs.jsx' does not exist.
-File '/home/node_modules/fs/index.js' does not exist.
-File '/home/node_modules/fs/index.jsx' does not exist.
-File '/node_modules/fs/package.json' does not exist according to earlier cached lookups.
-File '/node_modules/fs.js' does not exist.
-File '/node_modules/fs.jsx' does not exist.
-File '/node_modules/fs/index.js' does not exist.
-File '/node_modules/fs/index.jsx' does not exist.
+File '/home/src/workspaces/project/a/b/fs.js' does not exist.
+File '/home/src/workspaces/project/a/b/fs.jsx' does not exist.
+File '/home/src/workspaces/project/a/fs.js' does not exist.
+File '/home/src/workspaces/project/a/fs.jsx' does not exist.
+File '/home/src/workspaces/project/fs.js' does not exist.
+File '/home/src/workspaces/project/fs.jsx' does not exist.
+File '/home/src/workspaces/fs.js' does not exist.
+File '/home/src/workspaces/fs.jsx' does not exist.
+File '/home/src/fs.js' does not exist.
+File '/home/src/fs.jsx' does not exist.
+File '/home/fs.js' does not exist.
+File '/home/fs.jsx' does not exist.
+File '/fs.js' does not exist.
+File '/fs.jsx' does not exist.
 ======== Module name 'fs' was not resolved. ========
 
 MissingPaths:: []
 
-home/src/workspaces/project/a/b/app.ts(2,21): error TS2307: Cannot find module 'fs' or its corresponding type declarations.
+home/src/workspaces/project/a/b/app.ts(2,21): error TS2792: Cannot find module 'fs'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js b/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js
index e17d519356fa8..81b2c913b2fe6 100644
--- a/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js
+++ b/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js
@@ -4,98 +4,18 @@ File: /home/src/workspaces/project/a.ts
 
 import * as a from "a";a;
 resolvedModules:
-a: esnext: {
-  "failedLookupLocations": [
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.ts",
-    "/home/src/workspaces/project/node_modules/a.tsx",
-    "/home/src/workspaces/project/node_modules/a.d.ts",
-    "/home/src/workspaces/project/node_modules/a/index.ts",
-    "/home/src/workspaces/project/node_modules/a/index.tsx",
-    "/home/src/workspaces/project/node_modules/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/package.json",
-    "/home/src/workspaces/project/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.ts",
-    "/home/src/workspaces/node_modules/a.tsx",
-    "/home/src/workspaces/node_modules/a.d.ts",
-    "/home/src/workspaces/node_modules/a/index.ts",
-    "/home/src/workspaces/node_modules/a/index.tsx",
-    "/home/src/workspaces/node_modules/a/index.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/package.json",
-    "/home/src/workspaces/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/index.d.ts",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.ts",
-    "/home/src/node_modules/a.tsx",
-    "/home/src/node_modules/a.d.ts",
-    "/home/src/node_modules/a/index.ts",
-    "/home/src/node_modules/a/index.tsx",
-    "/home/src/node_modules/a/index.d.ts",
-    "/home/src/node_modules/@types/a/package.json",
-    "/home/src/node_modules/@types/a.d.ts",
-    "/home/src/node_modules/@types/a/index.d.ts",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.ts",
-    "/home/node_modules/a.tsx",
-    "/home/node_modules/a.d.ts",
-    "/home/node_modules/a/index.ts",
-    "/home/node_modules/a/index.tsx",
-    "/home/node_modules/a/index.d.ts",
-    "/home/node_modules/@types/a/package.json",
-    "/home/node_modules/@types/a.d.ts",
-    "/home/node_modules/@types/a/index.d.ts",
-    "/node_modules/a/package.json",
-    "/node_modules/a.ts",
-    "/node_modules/a.tsx",
-    "/node_modules/a.d.ts",
-    "/node_modules/a/index.ts",
-    "/node_modules/a/index.tsx",
-    "/node_modules/a/index.d.ts",
-    "/node_modules/@types/a/package.json",
-    "/node_modules/@types/a.d.ts",
-    "/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.js",
-    "/home/src/workspaces/project/node_modules/a.jsx",
-    "/home/src/workspaces/project/node_modules/a/index.js",
-    "/home/src/workspaces/project/node_modules/a/index.jsx",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.js",
-    "/home/src/workspaces/node_modules/a.jsx",
-    "/home/src/workspaces/node_modules/a/index.js",
-    "/home/src/workspaces/node_modules/a/index.jsx",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.js",
-    "/home/src/node_modules/a.jsx",
-    "/home/src/node_modules/a/index.js",
-    "/home/src/node_modules/a/index.jsx",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.js",
-    "/home/node_modules/a.jsx",
-    "/home/node_modules/a/index.js",
-    "/home/node_modules/a/index.jsx",
-    "/node_modules/a/package.json",
-    "/node_modules/a.js",
-    "/node_modules/a.jsx",
-    "/node_modules/a/index.js",
-    "/node_modules/a/index.jsx",
-    "/home/src/workspaces/project/types/a.d.ts",
-    "/home/src/workspaces/project/types/a/package.json",
-    "/home/src/workspaces/project/types/a/index.d.ts"
-  ]
+a: {
+  "resolvedModule": {
+    "resolvedFileName": "/home/src/workspaces/project/a.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 
 MissingPaths:: []
 
-home/src/workspaces/project/a.ts(3,20): error TS2307: Cannot find module 'a' or its corresponding type declarations.
 
 
 
@@ -106,98 +26,18 @@ File: /home/src/workspaces/project/a.ts
 
 import * as a from "a";a;
 resolvedModules:
-a: esnext: {
-  "failedLookupLocations": [
-    "/home/src/workspaces/project/package.json",
-    "/home/src/workspaces/package.json",
-    "/home/src/package.json",
-    "/home/package.json",
-    "/package.json",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.ts",
-    "/home/src/workspaces/project/node_modules/a.tsx",
-    "/home/src/workspaces/project/node_modules/a.d.ts",
-    "/home/src/workspaces/project/node_modules/a/index.ts",
-    "/home/src/workspaces/project/node_modules/a/index.tsx",
-    "/home/src/workspaces/project/node_modules/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/package.json",
-    "/home/src/workspaces/project/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/project/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.ts",
-    "/home/src/workspaces/node_modules/a.tsx",
-    "/home/src/workspaces/node_modules/a.d.ts",
-    "/home/src/workspaces/node_modules/a/index.ts",
-    "/home/src/workspaces/node_modules/a/index.tsx",
-    "/home/src/workspaces/node_modules/a/index.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/package.json",
-    "/home/src/workspaces/node_modules/@types/a.d.ts",
-    "/home/src/workspaces/node_modules/@types/a/index.d.ts",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.ts",
-    "/home/src/node_modules/a.tsx",
-    "/home/src/node_modules/a.d.ts",
-    "/home/src/node_modules/a/index.ts",
-    "/home/src/node_modules/a/index.tsx",
-    "/home/src/node_modules/a/index.d.ts",
-    "/home/src/node_modules/@types/a/package.json",
-    "/home/src/node_modules/@types/a.d.ts",
-    "/home/src/node_modules/@types/a/index.d.ts",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.ts",
-    "/home/node_modules/a.tsx",
-    "/home/node_modules/a.d.ts",
-    "/home/node_modules/a/index.ts",
-    "/home/node_modules/a/index.tsx",
-    "/home/node_modules/a/index.d.ts",
-    "/home/node_modules/@types/a/package.json",
-    "/home/node_modules/@types/a.d.ts",
-    "/home/node_modules/@types/a/index.d.ts",
-    "/node_modules/a/package.json",
-    "/node_modules/a.ts",
-    "/node_modules/a.tsx",
-    "/node_modules/a.d.ts",
-    "/node_modules/a/index.ts",
-    "/node_modules/a/index.tsx",
-    "/node_modules/a/index.d.ts",
-    "/node_modules/@types/a/package.json",
-    "/node_modules/@types/a.d.ts",
-    "/node_modules/@types/a/index.d.ts",
-    "/home/src/workspaces/project/node_modules/a/package.json",
-    "/home/src/workspaces/project/node_modules/a.js",
-    "/home/src/workspaces/project/node_modules/a.jsx",
-    "/home/src/workspaces/project/node_modules/a/index.js",
-    "/home/src/workspaces/project/node_modules/a/index.jsx",
-    "/home/src/workspaces/node_modules/a/package.json",
-    "/home/src/workspaces/node_modules/a.js",
-    "/home/src/workspaces/node_modules/a.jsx",
-    "/home/src/workspaces/node_modules/a/index.js",
-    "/home/src/workspaces/node_modules/a/index.jsx",
-    "/home/src/node_modules/a/package.json",
-    "/home/src/node_modules/a.js",
-    "/home/src/node_modules/a.jsx",
-    "/home/src/node_modules/a/index.js",
-    "/home/src/node_modules/a/index.jsx",
-    "/home/node_modules/a/package.json",
-    "/home/node_modules/a.js",
-    "/home/node_modules/a.jsx",
-    "/home/node_modules/a/index.js",
-    "/home/node_modules/a/index.jsx",
-    "/node_modules/a/package.json",
-    "/node_modules/a.js",
-    "/node_modules/a.jsx",
-    "/node_modules/a/index.js",
-    "/node_modules/a/index.jsx",
-    "/home/src/workspaces/project/types/a.d.ts",
-    "/home/src/workspaces/project/types/a/package.json",
-    "/home/src/workspaces/project/types/a/index.d.ts"
-  ]
+a: {
+  "resolvedModule": {
+    "resolvedFileName": "/home/src/workspaces/project/a.ts",
+    "extension": ".ts",
+    "isExternalLibraryImport": false,
+    "resolvedUsingTsExtension": false
+  }
 }
 
 
 MissingPaths:: []
 
-home/src/workspaces/project/a.ts(3,20): error TS2307: Cannot find module 'a' or its corresponding type declarations.
 
 
 
diff --git a/tests/baselines/reference/scopedPackagesClassic.errors.txt b/tests/baselines/reference/scopedPackagesClassic.errors.txt
deleted file mode 100644
index fc020f78f7316..0000000000000
--- a/tests/baselines/reference/scopedPackagesClassic.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /a.ts (0 errors) ====
-    import { x } from "@see/saw";
-    
-==== /node_modules/@types/see__saw/index.d.ts (0 errors) ====
-    export const x = 0;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js b/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js
index efa2069547706..75da3fda1d9e7 100644
--- a/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js
+++ b/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js
@@ -11,11 +11,8 @@ export default {
 
 //// [QSpinner.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var QSpinner_1 = __importDefault(require("./QSpinner"));
+var QSpinner_1 = require("./QSpinner");
 exports.default = {
     mixins: [QSpinner_1.default],
     name: 'QSpinner'
diff --git a/tests/baselines/reference/shorthand-property-es5-es6.errors.txt b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
index 5ce21bfdd8af2..d34857c693186 100644
--- a/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
+++ b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
@@ -1,10 +1,10 @@
-test.ts(1,19): error TS2307: Cannot find module './foo' or its corresponding type declarations.
+test.ts(1,19): error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== test.ts (1 errors) ====
     import {foo} from './foo';
                       ~~~~~~~
-!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     const baz = 42;
     const bar = { foo, baz };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.errors.txt b/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
index b35916f415fb3..d34857c693186 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
+++ b/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 test.ts(1,19): error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== test.ts (1 errors) ====
     import {foo} from './foo';
                       ~~~~~~~
diff --git a/tests/baselines/reference/shorthand-property-es6-es6.errors.txt b/tests/baselines/reference/shorthand-property-es6-es6.errors.txt
index 5ce21bfdd8af2..d34857c693186 100644
--- a/tests/baselines/reference/shorthand-property-es6-es6.errors.txt
+++ b/tests/baselines/reference/shorthand-property-es6-es6.errors.txt
@@ -1,10 +1,10 @@
-test.ts(1,19): error TS2307: Cannot find module './foo' or its corresponding type declarations.
+test.ts(1,19): error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== test.ts (1 errors) ====
     import {foo} from './foo';
                       ~~~~~~~
-!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     const baz = 42;
     const bar = { foo, baz };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.errors.txt b/tests/baselines/reference/sourceMapValidationExportAssignment.errors.txt
deleted file mode 100644
index b0d75117e07c5..0000000000000
--- a/tests/baselines/reference/sourceMapValidationExportAssignment.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== sourceMapValidationExportAssignment.ts (0 errors) ====
-    class a {
-        public c;
-    }
-    export = a;
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.types b/tests/baselines/reference/sourceMapValidationExportAssignment.types
index e8e3e719bdc56..7b63b2dff88be 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignment.types
+++ b/tests/baselines/reference/sourceMapValidationExportAssignment.types
@@ -7,7 +7,6 @@ class a {
 
     public c;
 >c : any
->  : ^^^
 }
 export = a;
 >a : a
diff --git a/tests/baselines/reference/spellingSuggestionJSXAttribute.js b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
index 2fcc65228a5b2..56fb4d068a569 100644
--- a/tests/baselines/reference/spellingSuggestionJSXAttribute.js
+++ b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
@@ -35,42 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = __importStar(require("react"));
+var React = require("react");
 function MyComp2(props) {
     return null;
 }
diff --git a/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js b/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
index 57bc0ae1ea8e1..3edec230fe0f8 100644
--- a/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
+++ b/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
@@ -64,41 +64,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var stuff = __importStar(require("./spreadExpressionContextualTypeWithNamespace_0"));
+var stuff = require("./spreadExpressionContextualTypeWithNamespace_0");
 stuff.func;
 stuff.klass;
 stuff.obj;
diff --git a/tests/baselines/reference/spreadUnionPropOverride.errors.txt b/tests/baselines/reference/spreadUnionPropOverride.errors.txt
deleted file mode 100644
index 120aeb7f1a62e..0000000000000
--- a/tests/baselines/reference/spreadUnionPropOverride.errors.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-spreadUnionPropOverride.ts(30,5): error TS2783: 'x' is specified more than once, so this usage will be overwritten.
-spreadUnionPropOverride.ts(46,5): error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-spreadUnionPropOverride.ts(63,5): error TS2783: 'name' is specified more than once, so this usage will be overwritten.
-
-
-==== spreadUnionPropOverride.ts (3 errors) ====
-    // Repro from #62655
-    type Thing = {
-        id: string;
-        label: string;
-    };
-    
-    const things: Thing[] = [];
-    
-    function find(id: string): undefined | Thing {
-        return things.find(thing => thing.id === id);
-    }
-    
-    declare function fun(thing: Thing): void;
-    
-    fun({
-        id: 'foo',
-        ...find('foo') ?? {
-            label: 'Foo',
-        },
-    });
-    
-    // Should not error when spreading a union where one type doesn't have the property
-    const obj1 = {
-        x: 1,
-        ...(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }),
-    }; // OK - x might be overwritten
-    
-    // Should error when the property is in all constituents
-    const obj2 = {
-        x: 1,
-        ~~~~
-!!! error TS2783: 'x' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 spreadUnionPropOverride.ts:31:5: This spread always overwrites this property.
-        ...(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }),
-    }; // Error - x is always overwritten
-    
-    // Should not error with optional property in union
-    type Partial1 = { a: string; b?: number };
-    type Partial2 = { a: string; c: boolean };
-    declare const partial: Partial1 | Partial2;
-    
-    const obj3 = {
-        b: 42,
-        ...partial,
-    }; // OK - b is optional in Partial1 and missing in Partial2
-    
-    // Should error when property is required in all types
-    const obj4 = {
-        a: "test",
-        ~~~~~~~~~
-!!! error TS2783: 'a' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 spreadUnionPropOverride.ts:47:5: This spread always overwrites this property.
-        ...partial,
-    }; // Error - a is required in both types
-    
-    // More complex union case
-    type A = { id: string; name: string };
-    type B = { name: string; age: number };
-    type C = { name: string };
-    
-    declare const abc: A | B | C;
-    
-    const obj5 = {
-        id: "123",
-        ...abc,
-    }; // OK - id is only in A
-    
-    const obj6 = {
-        name: "test",
-        ~~~~~~~~~~~~
-!!! error TS2783: 'name' is specified more than once, so this usage will be overwritten.
-!!! related TS2785 spreadUnionPropOverride.ts:64:5: This spread always overwrites this property.
-        ...abc,
-    }; // Error - name is in all types
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/spreadUnionPropOverride.js b/tests/baselines/reference/spreadUnionPropOverride.js
deleted file mode 100644
index 7a82dfe91213e..0000000000000
--- a/tests/baselines/reference/spreadUnionPropOverride.js
+++ /dev/null
@@ -1,100 +0,0 @@
-//// [tests/cases/compiler/spreadUnionPropOverride.ts] ////
-
-//// [spreadUnionPropOverride.ts]
-// Repro from #62655
-type Thing = {
-    id: string;
-    label: string;
-};
-
-const things: Thing[] = [];
-
-function find(id: string): undefined | Thing {
-    return things.find(thing => thing.id === id);
-}
-
-declare function fun(thing: Thing): void;
-
-fun({
-    id: 'foo',
-    ...find('foo') ?? {
-        label: 'Foo',
-    },
-});
-
-// Should not error when spreading a union where one type doesn't have the property
-const obj1 = {
-    x: 1,
-    ...(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }),
-}; // OK - x might be overwritten
-
-// Should error when the property is in all constituents
-const obj2 = {
-    x: 1,
-    ...(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }),
-}; // Error - x is always overwritten
-
-// Should not error with optional property in union
-type Partial1 = { a: string; b?: number };
-type Partial2 = { a: string; c: boolean };
-declare const partial: Partial1 | Partial2;
-
-const obj3 = {
-    b: 42,
-    ...partial,
-}; // OK - b is optional in Partial1 and missing in Partial2
-
-// Should error when property is required in all types
-const obj4 = {
-    a: "test",
-    ...partial,
-}; // Error - a is required in both types
-
-// More complex union case
-type A = { id: string; name: string };
-type B = { name: string; age: number };
-type C = { name: string };
-
-declare const abc: A | B | C;
-
-const obj5 = {
-    id: "123",
-    ...abc,
-}; // OK - id is only in A
-
-const obj6 = {
-    name: "test",
-    ...abc,
-}; // Error - name is in all types
-
-
-//// [spreadUnionPropOverride.js]
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var _a;
-var things = [];
-function find(id) {
-    return things.find(function (thing) { return thing.id === id; });
-}
-fun(__assign({ id: 'foo' }, (_a = find('foo')) !== null && _a !== void 0 ? _a : {
-    label: 'Foo',
-}));
-// Should not error when spreading a union where one type doesn't have the property
-var obj1 = __assign({ x: 1 }, (Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 })); // OK - x might be overwritten
-// Should error when the property is in all constituents
-var obj2 = __assign({ x: 1 }, (Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 })); // Error - x is always overwritten
-var obj3 = __assign({ b: 42 }, partial); // OK - b is optional in Partial1 and missing in Partial2
-// Should error when property is required in all types
-var obj4 = __assign({ a: "test" }, partial); // Error - a is required in both types
-var obj5 = __assign({ id: "123" }, abc); // OK - id is only in A
-var obj6 = __assign({ name: "test" }, abc); // Error - name is in all types
diff --git a/tests/baselines/reference/spreadUnionPropOverride.symbols b/tests/baselines/reference/spreadUnionPropOverride.symbols
deleted file mode 100644
index 83dbad64a727a..0000000000000
--- a/tests/baselines/reference/spreadUnionPropOverride.symbols
+++ /dev/null
@@ -1,172 +0,0 @@
-//// [tests/cases/compiler/spreadUnionPropOverride.ts] ////
-
-=== spreadUnionPropOverride.ts ===
-// Repro from #62655
-type Thing = {
->Thing : Symbol(Thing, Decl(spreadUnionPropOverride.ts, 0, 0))
-
-    id: string;
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 1, 14))
-
-    label: string;
->label : Symbol(label, Decl(spreadUnionPropOverride.ts, 2, 15))
-
-};
-
-const things: Thing[] = [];
->things : Symbol(things, Decl(spreadUnionPropOverride.ts, 6, 5))
->Thing : Symbol(Thing, Decl(spreadUnionPropOverride.ts, 0, 0))
-
-function find(id: string): undefined | Thing {
->find : Symbol(find, Decl(spreadUnionPropOverride.ts, 6, 27))
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 8, 14))
->Thing : Symbol(Thing, Decl(spreadUnionPropOverride.ts, 0, 0))
-
-    return things.find(thing => thing.id === id);
->things.find : Symbol(Array.find, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->things : Symbol(things, Decl(spreadUnionPropOverride.ts, 6, 5))
->find : Symbol(Array.find, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->thing : Symbol(thing, Decl(spreadUnionPropOverride.ts, 9, 23))
->thing.id : Symbol(id, Decl(spreadUnionPropOverride.ts, 1, 14))
->thing : Symbol(thing, Decl(spreadUnionPropOverride.ts, 9, 23))
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 1, 14))
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 8, 14))
-}
-
-declare function fun(thing: Thing): void;
->fun : Symbol(fun, Decl(spreadUnionPropOverride.ts, 10, 1))
->thing : Symbol(thing, Decl(spreadUnionPropOverride.ts, 12, 21))
->Thing : Symbol(Thing, Decl(spreadUnionPropOverride.ts, 0, 0))
-
-fun({
->fun : Symbol(fun, Decl(spreadUnionPropOverride.ts, 10, 1))
-
-    id: 'foo',
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 14, 5))
-
-    ...find('foo') ?? {
->find : Symbol(find, Decl(spreadUnionPropOverride.ts, 6, 27))
-
-        label: 'Foo',
->label : Symbol(label, Decl(spreadUnionPropOverride.ts, 16, 23))
-
-    },
-});
-
-// Should not error when spreading a union where one type doesn't have the property
-const obj1 = {
->obj1 : Symbol(obj1, Decl(spreadUnionPropOverride.ts, 22, 5))
-
-    x: 1,
->x : Symbol(x, Decl(spreadUnionPropOverride.ts, 22, 14))
-
-    ...(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }),
->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
->y : Symbol(y, Decl(spreadUnionPropOverride.ts, 24, 31))
->y : Symbol(y, Decl(spreadUnionPropOverride.ts, 24, 42))
->x : Symbol(x, Decl(spreadUnionPropOverride.ts, 24, 48))
-
-}; // OK - x might be overwritten
-
-// Should error when the property is in all constituents
-const obj2 = {
->obj2 : Symbol(obj2, Decl(spreadUnionPropOverride.ts, 28, 5))
-
-    x: 1,
->x : Symbol(x, Decl(spreadUnionPropOverride.ts, 28, 14))
-
-    ...(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }),
->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(spreadUnionPropOverride.ts, 30, 31))
->y : Symbol(y, Decl(spreadUnionPropOverride.ts, 30, 37))
->x : Symbol(x, Decl(spreadUnionPropOverride.ts, 30, 48))
->z : Symbol(z, Decl(spreadUnionPropOverride.ts, 30, 54))
-
-}; // Error - x is always overwritten
-
-// Should not error with optional property in union
-type Partial1 = { a: string; b?: number };
->Partial1 : Symbol(Partial1, Decl(spreadUnionPropOverride.ts, 31, 2))
->a : Symbol(a, Decl(spreadUnionPropOverride.ts, 34, 17))
->b : Symbol(b, Decl(spreadUnionPropOverride.ts, 34, 28))
-
-type Partial2 = { a: string; c: boolean };
->Partial2 : Symbol(Partial2, Decl(spreadUnionPropOverride.ts, 34, 42))
->a : Symbol(a, Decl(spreadUnionPropOverride.ts, 35, 17))
->c : Symbol(c, Decl(spreadUnionPropOverride.ts, 35, 28))
-
-declare const partial: Partial1 | Partial2;
->partial : Symbol(partial, Decl(spreadUnionPropOverride.ts, 36, 13))
->Partial1 : Symbol(Partial1, Decl(spreadUnionPropOverride.ts, 31, 2))
->Partial2 : Symbol(Partial2, Decl(spreadUnionPropOverride.ts, 34, 42))
-
-const obj3 = {
->obj3 : Symbol(obj3, Decl(spreadUnionPropOverride.ts, 38, 5))
-
-    b: 42,
->b : Symbol(b, Decl(spreadUnionPropOverride.ts, 38, 14))
-
-    ...partial,
->partial : Symbol(partial, Decl(spreadUnionPropOverride.ts, 36, 13))
-
-}; // OK - b is optional in Partial1 and missing in Partial2
-
-// Should error when property is required in all types
-const obj4 = {
->obj4 : Symbol(obj4, Decl(spreadUnionPropOverride.ts, 44, 5))
-
-    a: "test",
->a : Symbol(a, Decl(spreadUnionPropOverride.ts, 44, 14))
-
-    ...partial,
->partial : Symbol(partial, Decl(spreadUnionPropOverride.ts, 36, 13))
-
-}; // Error - a is required in both types
-
-// More complex union case
-type A = { id: string; name: string };
->A : Symbol(A, Decl(spreadUnionPropOverride.ts, 47, 2))
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 50, 10))
->name : Symbol(name, Decl(spreadUnionPropOverride.ts, 50, 22))
-
-type B = { name: string; age: number };
->B : Symbol(B, Decl(spreadUnionPropOverride.ts, 50, 38))
->name : Symbol(name, Decl(spreadUnionPropOverride.ts, 51, 10))
->age : Symbol(age, Decl(spreadUnionPropOverride.ts, 51, 24))
-
-type C = { name: string };
->C : Symbol(C, Decl(spreadUnionPropOverride.ts, 51, 39))
->name : Symbol(name, Decl(spreadUnionPropOverride.ts, 52, 10))
-
-declare const abc: A | B | C;
->abc : Symbol(abc, Decl(spreadUnionPropOverride.ts, 54, 13))
->A : Symbol(A, Decl(spreadUnionPropOverride.ts, 47, 2))
->B : Symbol(B, Decl(spreadUnionPropOverride.ts, 50, 38))
->C : Symbol(C, Decl(spreadUnionPropOverride.ts, 51, 39))
-
-const obj5 = {
->obj5 : Symbol(obj5, Decl(spreadUnionPropOverride.ts, 56, 5))
-
-    id: "123",
->id : Symbol(id, Decl(spreadUnionPropOverride.ts, 56, 14))
-
-    ...abc,
->abc : Symbol(abc, Decl(spreadUnionPropOverride.ts, 54, 13))
-
-}; // OK - id is only in A
-
-const obj6 = {
->obj6 : Symbol(obj6, Decl(spreadUnionPropOverride.ts, 61, 5))
-
-    name: "test",
->name : Symbol(name, Decl(spreadUnionPropOverride.ts, 61, 14))
-
-    ...abc,
->abc : Symbol(abc, Decl(spreadUnionPropOverride.ts, 54, 13))
-
-}; // Error - name is in all types
-
diff --git a/tests/baselines/reference/spreadUnionPropOverride.types b/tests/baselines/reference/spreadUnionPropOverride.types
deleted file mode 100644
index ff6f63848eca3..0000000000000
--- a/tests/baselines/reference/spreadUnionPropOverride.types
+++ /dev/null
@@ -1,319 +0,0 @@
-//// [tests/cases/compiler/spreadUnionPropOverride.ts] ////
-
-=== spreadUnionPropOverride.ts ===
-// Repro from #62655
-type Thing = {
->Thing : Thing
->      : ^^^^^
-
-    id: string;
->id : string
->   : ^^^^^^
-
-    label: string;
->label : string
->      : ^^^^^^
-
-};
-
-const things: Thing[] = [];
->things : Thing[]
->       : ^^^^^^^
->[] : never[]
->   : ^^^^^^^
-
-function find(id: string): undefined | Thing {
->find : (id: string) => undefined | Thing
->     : ^  ^^      ^^^^^                 
->id : string
->   : ^^^^^^
-
-    return things.find(thing => thing.id === id);
->things.find(thing => thing.id === id) : Thing | undefined
->                                      : ^^^^^^^^^^^^^^^^^
->things.find : { <S extends Thing>(predicate: (value: Thing, index: number, obj: Thing[]) => value is S, thisArg?: any): S | undefined; (predicate: (value: Thing, index: number, obj: Thing[]) => unknown, thisArg?: any): Thing | undefined; }
->            : ^^^ ^^^^^^^^^^^^^^^^         ^^^     ^^^^^^^^^     ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^^^^^^^^^^^^         ^^^     ^^^^^^^^^     ^^      ^^   ^^^^^^^^^^^^^^       ^^       ^^^   ^^^^^^^^^^^^^^^^^^^^^^^
->things : Thing[]
->       : ^^^^^^^
->find : { <S extends Thing>(predicate: (value: Thing, index: number, obj: Thing[]) => value is S, thisArg?: any): S | undefined; (predicate: (value: Thing, index: number, obj: Thing[]) => unknown, thisArg?: any): Thing | undefined; }
->     : ^^^ ^^^^^^^^^^^^^^^^         ^^^     ^^^^^^^^^     ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^^^^^^^^^^^^         ^^^     ^^^^^^^^^     ^^      ^^   ^^^^^^^^^^^^^^       ^^       ^^^   ^^^^^^^^^^^^^^^^^^^^^^^
->thing => thing.id === id : (thing: Thing) => boolean
->                         : ^     ^^^^^^^^^^^^^^^^^^^
->thing : Thing
->      : ^^^^^
->thing.id === id : boolean
->                : ^^^^^^^
->thing.id : string
->         : ^^^^^^
->thing : Thing
->      : ^^^^^
->id : string
->   : ^^^^^^
->id : string
->   : ^^^^^^
-}
-
-declare function fun(thing: Thing): void;
->fun : (thing: Thing) => void
->    : ^     ^^     ^^^^^    
->thing : Thing
->      : ^^^^^
-
-fun({
->fun({    id: 'foo',    ...find('foo') ?? {        label: 'Foo',    },}) : void
->                                                                        : ^^^^
->fun : (thing: Thing) => void
->    : ^     ^^     ^^^^^    
->{    id: 'foo',    ...find('foo') ?? {        label: 'Foo',    },} : { id: string; label: string; } | { label: string; id: string; }
->                                                                   : ^^^^^^      ^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    id: 'foo',
->id : string
->   : ^^^^^^
->'foo' : "foo"
->      : ^^^^^
-
-    ...find('foo') ?? {
->find('foo') ?? {        label: 'Foo',    } : Thing | { label: string; }
->                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
->find('foo') : Thing | undefined
->            : ^^^^^^^^^^^^^^^^^
->find : (id: string) => undefined | Thing
->     : ^  ^^      ^^^^^                 
->'foo' : "foo"
->      : ^^^^^
->{        label: 'Foo',    } : { label: string; }
->                            : ^^^^^^^^^^^^^^^^^^
-
-        label: 'Foo',
->label : string
->      : ^^^^^^
->'Foo' : "Foo"
->      : ^^^^^
-
-    },
-});
-
-// Should not error when spreading a union where one type doesn't have the property
-const obj1 = {
->obj1 : { y: number; x: number; } | { y: number; x: number; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->{    x: 1,    ...(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }),} : { y: number; x: number; } | { y: number; x: number; }
->                                                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    x: 1,
->x : number
->  : ^^^^^^
->1 : 1
->  : ^
-
-    ...(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }),
->(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }) : { y: number; } | { y: number; x: number; }
->                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 } : { y: number; } | { y: number; x: number; }
->                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->Math.random() > 0.5 : boolean
->                    : ^^^^^^^
->Math.random() : number
->              : ^^^^^^
->Math.random : () => number
->            : ^^^^^^      
->Math : Math
->     : ^^^^
->random : () => number
->       : ^^^^^^      
->0.5 : 0.5
->    : ^^^
->{ y: 2 } : { y: number; }
->         : ^^^^^^^^^^^^^^
->y : number
->  : ^^^^^^
->2 : 2
->  : ^
->{ y: 2, x: 3 } : { y: number; x: number; }
->               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->y : number
->  : ^^^^^^
->2 : 2
->  : ^
->x : number
->  : ^^^^^^
->3 : 3
->  : ^
-
-}; // OK - x might be overwritten
-
-// Should error when the property is in all constituents
-const obj2 = {
->obj2 : { x: number; y: number; } | { x: number; z: number; }
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->{    x: 1,    ...(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }),} : { x: number; y: number; } | { x: number; z: number; }
->                                                                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    x: 1,
->x : number
->  : ^^^^^^
->1 : 1
->  : ^
-
-    ...(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }),
->(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }) : { x: number; y: number; } | { x: number; z: number; }
->                                                        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 } : { x: number; y: number; } | { x: number; z: number; }
->                                                      : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->Math.random() > 0.5 : boolean
->                    : ^^^^^^^
->Math.random() : number
->              : ^^^^^^
->Math.random : () => number
->            : ^^^^^^      
->Math : Math
->     : ^^^^
->random : () => number
->       : ^^^^^^      
->0.5 : 0.5
->    : ^^^
->{ x: 2, y: 3 } : { x: number; y: number; }
->               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->x : number
->  : ^^^^^^
->2 : 2
->  : ^
->y : number
->  : ^^^^^^
->3 : 3
->  : ^
->{ x: 4, z: 5 } : { x: number; z: number; }
->               : ^^^^^^^^^^^^^^^^^^^^^^^^^
->x : number
->  : ^^^^^^
->4 : 4
->  : ^
->z : number
->  : ^^^^^^
->5 : 5
->  : ^
-
-}; // Error - x is always overwritten
-
-// Should not error with optional property in union
-type Partial1 = { a: string; b?: number };
->Partial1 : Partial1
->         : ^^^^^^^^
->a : string
->  : ^^^^^^
->b : number | undefined
->  : ^^^^^^^^^^^^^^^^^^
-
-type Partial2 = { a: string; c: boolean };
->Partial2 : Partial2
->         : ^^^^^^^^
->a : string
->  : ^^^^^^
->c : boolean
->  : ^^^^^^^
-
-declare const partial: Partial1 | Partial2;
->partial : Partial1 | Partial2
->        : ^^^^^^^^^^^^^^^^^^^
-
-const obj3 = {
->obj3 : { a: string; b: number; } | { a: string; c: boolean; b: number; }
->     : ^^^^^      ^^^^^      ^^^^^^^^^^^      ^^^^^       ^^^^^^^^^^^^^^
->{    b: 42,    ...partial,} : { a: string; b: number; } | { a: string; c: boolean; b: number; }
->                            : ^^^^^      ^^^^^      ^^^^^^^^^^^      ^^^^^       ^^^^^^^^^^^^^^
-
-    b: 42,
->b : number
->  : ^^^^^^
->42 : 42
->   : ^^
-
-    ...partial,
->partial : Partial1 | Partial2
->        : ^^^^^^^^^^^^^^^^^^^
-
-}; // OK - b is optional in Partial1 and missing in Partial2
-
-// Should error when property is required in all types
-const obj4 = {
->obj4 : { a: string; b?: number; } | { a: string; c: boolean; }
->     : ^^^^^      ^^^^^^      ^^^^^^^^^^^      ^^^^^       ^^^
->{    a: "test",    ...partial,} : { a: string; b?: number; } | { a: string; c: boolean; }
->                                : ^^^^^      ^^^^^^      ^^^^^^^^^^^      ^^^^^       ^^^
-
-    a: "test",
->a : string
->  : ^^^^^^
->"test" : "test"
->       : ^^^^^^
-
-    ...partial,
->partial : Partial1 | Partial2
->        : ^^^^^^^^^^^^^^^^^^^
-
-}; // Error - a is required in both types
-
-// More complex union case
-type A = { id: string; name: string };
->A : A
->  : ^
->id : string
->   : ^^^^^^
->name : string
->     : ^^^^^^
-
-type B = { name: string; age: number };
->B : B
->  : ^
->name : string
->     : ^^^^^^
->age : number
->    : ^^^^^^
-
-type C = { name: string };
->C : C
->  : ^
->name : string
->     : ^^^^^^
-
-declare const abc: A | B | C;
->abc : A | B | C
->    : ^^^^^^^^^
-
-const obj5 = {
->obj5 : { id: string; name: string; } | { name: string; age: number; id: string; } | { name: string; id: string; }
->     : ^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^
->{    id: "123",    ...abc,} : { id: string; name: string; } | { name: string; age: number; id: string; } | { name: string; id: string; }
->                            : ^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^
-
-    id: "123",
->id : string
->   : ^^^^^^
->"123" : "123"
->      : ^^^^^
-
-    ...abc,
->abc : A | B | C
->    : ^^^^^^^^^
-
-}; // OK - id is only in A
-
-const obj6 = {
->obj6 : { id: string; name: string; } | { name: string; age: number; } | { name: string; }
->     : ^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^      ^^^
->{    name: "test",    ...abc,} : { id: string; name: string; } | { name: string; age: number; } | { name: string; }
->                               : ^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^      ^^^
-
-    name: "test",
->name : string
->     : ^^^^^^
->"test" : "test"
->       : ^^^^^^
-
-    ...abc,
->abc : A | B | C
->    : ^^^^^^^^^
-
-}; // Error - name is in all types
-
diff --git a/tests/baselines/reference/stackDepthLimitCastingType.js b/tests/baselines/reference/stackDepthLimitCastingType.js
index 13cce5a818e4e..4f96a0c33c023 100644
--- a/tests/baselines/reference/stackDepthLimitCastingType.js
+++ b/tests/baselines/reference/stackDepthLimitCastingType.js
@@ -41,40 +41,7 @@ hoge.fetch(null as any);
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var Backbone = __importStar(require("backbone"));
+var Backbone = require("backbone");
 var hoge = new Backbone.Model();
 hoge.fetch(null);
diff --git a/tests/baselines/reference/staticInstanceResolution5.errors.txt b/tests/baselines/reference/staticInstanceResolution5.errors.txt
index d44a6f4221e75..296f8ade299fe 100644
--- a/tests/baselines/reference/staticInstanceResolution5.errors.txt
+++ b/tests/baselines/reference/staticInstanceResolution5.errors.txt
@@ -4,7 +4,7 @@ staticInstanceResolution5_1.ts(6,16): error TS2709: Cannot use namespace 'WinJS'
 
 
 ==== staticInstanceResolution5_1.ts (3 errors) ====
-    import WinJS = require('./staticInstanceResolution5_0');
+    import WinJS = require('staticInstanceResolution5_0');
     
     // these 3 should be errors
     var x = (w1: WinJS) => { };
diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js
index dc4d27dc14640..6b6c30a172071 100644
--- a/tests/baselines/reference/staticInstanceResolution5.js
+++ b/tests/baselines/reference/staticInstanceResolution5.js
@@ -8,7 +8,7 @@ export class Promise {
 }
 
 //// [staticInstanceResolution5_1.ts]
-import WinJS = require('./staticInstanceResolution5_0');
+import WinJS = require('staticInstanceResolution5_0');
 
 // these 3 should be errors
 var x = (w1: WinJS) => { };
@@ -17,22 +17,26 @@ function z(w3: WinJS) { }
 
 
 //// [staticInstanceResolution5_0.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Promise = void 0;
-var Promise = /** @class */ (function () {
-    function Promise() {
-    }
-    Promise.timeout = function (delay) {
-        return null;
-    };
-    return Promise;
-}());
-exports.Promise = Promise;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.Promise = void 0;
+    var Promise = /** @class */ (function () {
+        function Promise() {
+        }
+        Promise.timeout = function (delay) {
+            return null;
+        };
+        return Promise;
+    }());
+    exports.Promise = Promise;
+});
 //// [staticInstanceResolution5_1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// these 3 should be errors
-var x = function (w1) { };
-var y = function (w2) { };
-function z(w3) { }
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // these 3 should be errors
+    var x = function (w1) { };
+    var y = function (w2) { };
+    function z(w3) { }
+});
diff --git a/tests/baselines/reference/staticInstanceResolution5.symbols b/tests/baselines/reference/staticInstanceResolution5.symbols
index 60e199749224e..9d178615f6a36 100644
--- a/tests/baselines/reference/staticInstanceResolution5.symbols
+++ b/tests/baselines/reference/staticInstanceResolution5.symbols
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/staticInstanceResolution5.ts] ////
 
 === staticInstanceResolution5_1.ts ===
-import WinJS = require('./staticInstanceResolution5_0');
+import WinJS = require('staticInstanceResolution5_0');
 >WinJS : Symbol(WinJS, Decl(staticInstanceResolution5_1.ts, 0, 0))
 
 // these 3 should be errors
diff --git a/tests/baselines/reference/staticInstanceResolution5.types b/tests/baselines/reference/staticInstanceResolution5.types
index e3221b6b7161a..b61028cde79de 100644
--- a/tests/baselines/reference/staticInstanceResolution5.types
+++ b/tests/baselines/reference/staticInstanceResolution5.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/staticInstanceResolution5.ts] ////
 
 === staticInstanceResolution5_1.ts ===
-import WinJS = require('./staticInstanceResolution5_0');
+import WinJS = require('staticInstanceResolution5_0');
 >WinJS : typeof WinJS
 >      : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt b/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt
index e1b1be31e6546..9c6385f8461b0 100644
--- a/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt
+++ b/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt
@@ -1,9 +1,9 @@
 strictModeWordInImportDeclaration.ts(2,13): error TS1214: Identifier expected. 'package' is a reserved word in strict mode. Modules are automatically in strict mode.
-strictModeWordInImportDeclaration.ts(2,26): error TS2307: Cannot find module './1' or its corresponding type declarations.
+strictModeWordInImportDeclaration.ts(2,26): error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 strictModeWordInImportDeclaration.ts(3,16): error TS1214: Identifier expected. 'private' is a reserved word in strict mode. Modules are automatically in strict mode.
-strictModeWordInImportDeclaration.ts(3,30): error TS2307: Cannot find module './1' or its corresponding type declarations.
+strictModeWordInImportDeclaration.ts(3,30): error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 strictModeWordInImportDeclaration.ts(4,8): error TS1214: Identifier expected. 'public' is a reserved word in strict mode. Modules are automatically in strict mode.
-strictModeWordInImportDeclaration.ts(4,20): error TS2307: Cannot find module './1' or its corresponding type declarations.
+strictModeWordInImportDeclaration.ts(4,20): error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
 ==== strictModeWordInImportDeclaration.ts (6 errors) ====
@@ -12,14 +12,14 @@ strictModeWordInImportDeclaration.ts(4,20): error TS2307: Cannot find module './
                 ~~~~~~~
 !!! error TS1214: Identifier expected. 'package' is a reserved word in strict mode. Modules are automatically in strict mode.
                              ~~~~~
-!!! error TS2307: Cannot find module './1' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     import {foo as private} from "./1"
                    ~~~~~~~
 !!! error TS1214: Identifier expected. 'private' is a reserved word in strict mode. Modules are automatically in strict mode.
                                  ~~~~~
-!!! error TS2307: Cannot find module './1' or its corresponding type declarations.
+!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     import public from "./1"
            ~~~~~~
 !!! error TS1214: Identifier expected. 'public' is a reserved word in strict mode. Modules are automatically in strict mode.
                        ~~~~~
-!!! error TS2307: Cannot find module './1' or its corresponding type declarations.
\ No newline at end of file
+!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
\ No newline at end of file
diff --git a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
index 2fb1a85d85724..bcc9d95977dc5 100644
--- a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
+++ b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
@@ -29,42 +29,9 @@ export const a = pkg.invoke();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-var pkg = __importStar(require("package-b"));
+var pkg = require("package-b");
 exports.a = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
index c63f1f8d94a1f..43b73b8609b8b 100644
--- a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
+++ b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
@@ -31,42 +31,9 @@ export const a = pkg.invoke();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-var pkg = __importStar(require("package-b"));
+var pkg = require("package-b");
 exports.a = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
index 4ea2dfa82fa9b..bfeee1d566342 100644
--- a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
+++ b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
@@ -31,42 +31,9 @@ export const a = pkg.invoke();
 
 //// [index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-var pkg = __importStar(require("package-b"));
+var pkg = require("package-b");
 exports.a = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt b/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt
index 7f53b98d95bff..1cb7bc88fe9c6 100644
--- a/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt
+++ b/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt
@@ -1,11 +1,9 @@
 error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== node_modules/package/index.d.ts (0 errors) ====
     declare function packageExport(x: number): string;
     export = packageExport;
diff --git a/tests/baselines/reference/systemDefaultExportCommentValidity.errors.txt b/tests/baselines/reference/systemDefaultExportCommentValidity.errors.txt
deleted file mode 100644
index fdb0c2a28e904..0000000000000
--- a/tests/baselines/reference/systemDefaultExportCommentValidity.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemDefaultExportCommentValidity.ts (0 errors) ====
-    const Home = {}
-    
-    export default Home
-    // There is intentionally no semicolon on the prior line, this comment should not break emit
\ No newline at end of file
diff --git a/tests/baselines/reference/systemDefaultImportCallable.errors.txt b/tests/baselines/reference/systemDefaultImportCallable.errors.txt
deleted file mode 100644
index d20d06e87a1d1..0000000000000
--- a/tests/baselines/reference/systemDefaultImportCallable.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== core-js.d.ts (0 errors) ====
-    declare namespace core {
-        var String: {
-            repeat(text: string, count: number): string;
-        };
-    }
-    declare module "core-js/fn/string/repeat" {
-        var repeat: typeof core.String.repeat;
-        export default repeat;
-    }
-==== greeter.ts (0 errors) ====
-    import repeat from "core-js/fn/string/repeat";
-    
-    const _: string = repeat(new Date().toUTCString() + " ", 2);
\ No newline at end of file
diff --git a/tests/baselines/reference/systemExportAssignment.errors.txt b/tests/baselines/reference/systemExportAssignment.errors.txt
deleted file mode 100644
index e395bb6ce9566..0000000000000
--- a/tests/baselines/reference/systemExportAssignment.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.d.ts (0 errors) ====
-    declare var a: number;
-    export = a;  // OK, in ambient context
-    
-==== b.ts (0 errors) ====
-    import * as a from "a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemExportAssignment2.errors.txt b/tests/baselines/reference/systemExportAssignment2.errors.txt
index b9a7639bdf430..bc47a9626aeaa 100644
--- a/tests/baselines/reference/systemExportAssignment2.errors.txt
+++ b/tests/baselines/reference/systemExportAssignment2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 a.ts(2,1): error TS1218: Export assignment is not supported when '--module' flag is 'system'.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== a.ts (1 errors) ====
     var a = 10;
     export = a;  // Error: export = not allowed in ES6
diff --git a/tests/baselines/reference/systemExportAssignment3.errors.txt b/tests/baselines/reference/systemExportAssignment3.errors.txt
deleted file mode 100644
index 1cba25055d5a6..0000000000000
--- a/tests/baselines/reference/systemExportAssignment3.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== modules.d.ts (0 errors) ====
-    declare module "a" {
-        var a: number;
-        export = a;  // OK, in ambient context
-    }
-    
-==== b.ts (0 errors) ====
-    import * as a from "a";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemJsForInNoException.errors.txt b/tests/baselines/reference/systemJsForInNoException.errors.txt
deleted file mode 100644
index de456a5e717c6..0000000000000
--- a/tests/baselines/reference/systemJsForInNoException.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemJsForInNoException.ts (0 errors) ====
-    export const obj = { a: 1 };
-    for (var key in obj)
-        console.log(obj[key]);
\ No newline at end of file
diff --git a/tests/baselines/reference/systemJsForInNoException.types b/tests/baselines/reference/systemJsForInNoException.types
index 002f00aaffeaf..ad8e11ca9c644 100644
--- a/tests/baselines/reference/systemJsForInNoException.types
+++ b/tests/baselines/reference/systemJsForInNoException.types
@@ -26,8 +26,7 @@ for (var key in obj)
 >        : ^^^^^^^
 >log : (...data: any[]) => void
 >    : ^^^^    ^^     ^^^^^    
->obj[key] : any
->         : ^^^
+>obj[key] : error
 >obj : { a: number; }
 >    : ^^^^^^^^^^^^^^
 >key : string
diff --git a/tests/baselines/reference/systemModule1.errors.txt b/tests/baselines/reference/systemModule1.errors.txt
deleted file mode 100644
index e71f88a863151..0000000000000
--- a/tests/baselines/reference/systemModule1.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule1.ts (0 errors) ====
-    export var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule10.errors.txt b/tests/baselines/reference/systemModule10.errors.txt
index 7d61e7e751ed4..54c0ec5d7492a 100644
--- a/tests/baselines/reference/systemModule10.errors.txt
+++ b/tests/baselines/reference/systemModule10.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule10.ts(1,20): error TS2792: Cannot find module 'file1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 systemModule10.ts(2,21): error TS2792: Cannot find module 'file2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule10.ts (2 errors) ====
     import n, {x} from 'file1'
                        ~~~~~~~
diff --git a/tests/baselines/reference/systemModule10_ES5.errors.txt b/tests/baselines/reference/systemModule10_ES5.errors.txt
index 74d1e205ec46c..e5d2e568ab9af 100644
--- a/tests/baselines/reference/systemModule10_ES5.errors.txt
+++ b/tests/baselines/reference/systemModule10_ES5.errors.txt
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule10_ES5.ts(1,20): error TS2792: Cannot find module 'file1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 systemModule10_ES5.ts(2,21): error TS2792: Cannot find module 'file2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule10_ES5.ts (2 errors) ====
     import n, {x} from 'file1'
                        ~~~~~~~
diff --git a/tests/baselines/reference/systemModule11.errors.txt b/tests/baselines/reference/systemModule11.errors.txt
index 5266c7cac0c3b..9b7de8157beb4 100644
--- a/tests/baselines/reference/systemModule11.errors.txt
+++ b/tests/baselines/reference/systemModule11.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file1.ts(3,15): error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 file2.ts(6,15): error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 file3.ts(1,25): error TS2792: Cannot find module 'a'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -7,7 +6,6 @@ file4.ts(8,27): error TS2792: Cannot find module 'a'. Did you mean to set the 'm
 file5.ts(2,15): error TS2792: Cannot find module 'a'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file1.ts (1 errors) ====
     export var x;
     export function foo() {}
diff --git a/tests/baselines/reference/systemModule12.errors.txt b/tests/baselines/reference/systemModule12.errors.txt
index 86a8b181d1660..f841e1dc9b0bb 100644
--- a/tests/baselines/reference/systemModule12.errors.txt
+++ b/tests/baselines/reference/systemModule12.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule12.ts(2,15): error TS2792: Cannot find module 'file1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule12.ts (1 errors) ====
     ///<amd-module name='NamedModule'/>
     import n from 'file1'
diff --git a/tests/baselines/reference/systemModule13.errors.txt b/tests/baselines/reference/systemModule13.errors.txt
deleted file mode 100644
index 6f51819127913..0000000000000
--- a/tests/baselines/reference/systemModule13.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule13.ts (0 errors) ====
-    export let [x,y,z] = [1, 2, 3];
-    export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}};
-    for ([x] of [[1]]) {}
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule14.errors.txt b/tests/baselines/reference/systemModule14.errors.txt
index 87a6c046415e8..9e68e02c4158e 100644
--- a/tests/baselines/reference/systemModule14.errors.txt
+++ b/tests/baselines/reference/systemModule14.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule14.ts(5,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule14.ts (1 errors) ====
     function foo() {
         return a;
diff --git a/tests/baselines/reference/systemModule15.errors.txt b/tests/baselines/reference/systemModule15.errors.txt
deleted file mode 100644
index a22b09ee6fb07..0000000000000
--- a/tests/baselines/reference/systemModule15.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    import * as moduleB from "./file2"
-    
-    declare function use(v: any): void;
-    
-    use(moduleB.value);
-    use(moduleB.moduleC);
-    use(moduleB.moduleCStar);
-    
-==== file2.ts (0 errors) ====
-    import * as moduleCStar from "./file3"
-    import {value2} from "./file4"
-    import moduleC from "./file3"
-    import {value} from "./file3"
-    
-    export {
-        moduleCStar,
-        moduleC,
-        value
-    }
-    
-==== file3.ts (0 errors) ====
-    export var value = "youpi";
-    export default value;
-    
-==== file4.ts (0 errors) ====
-    export var value2 = "v";
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule15.types b/tests/baselines/reference/systemModule15.types
index e26a11f1e8bef..a648d1aacc58d 100644
--- a/tests/baselines/reference/systemModule15.types
+++ b/tests/baselines/reference/systemModule15.types
@@ -9,7 +9,6 @@ declare function use(v: any): void;
 >use : (v: any) => void
 >    : ^ ^^   ^^^^^    
 >v : any
->  : ^^^
 
 use(moduleB.value);
 >use(moduleB.value) : void
diff --git a/tests/baselines/reference/systemModule16.errors.txt b/tests/baselines/reference/systemModule16.errors.txt
index 99c99fd90e087..cda21993deb8f 100644
--- a/tests/baselines/reference/systemModule16.errors.txt
+++ b/tests/baselines/reference/systemModule16.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule16.ts(1,20): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 systemModule16.ts(2,20): error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 systemModule16.ts(3,15): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -11,7 +10,6 @@ systemModule16.ts(10,1): error TS2695: Left side of comma operator is unused and
 systemModule16.ts(10,1): error TS2695: Left side of comma operator is unused and has no side effects.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule16.ts (10 errors) ====
     import * as x from "foo";
                        ~~~~~
diff --git a/tests/baselines/reference/systemModule17.errors.txt b/tests/baselines/reference/systemModule17.errors.txt
deleted file mode 100644
index 28f5dc8fbadb9..0000000000000
--- a/tests/baselines/reference/systemModule17.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== f1.ts (0 errors) ====
-    export class A {}
-    export interface I {}
-    
-==== f2.ts (0 errors) ====
-    var x = 1;
-    interface I { }
-    
-    namespace N {
-    	export var x = 1;
-    	export interface I { }	
-    }
-    
-    import IX = N.x;
-    import II = N.I;
-    import { A, A as EA, I as EI } from "f1";
-    
-    export {x};
-    export {x as x1};
-    
-    export {I};
-    export {I as I1};
-    
-    export {A};
-    export {A as A1};
-    
-    export {EA};
-    export {EA as EA1};
-    
-    export {EI };
-    export {EI as EI1};
-    
-    export {IX};
-    export {IX as IX1};
-    
-    export {II};
-    export {II as II1};
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule18.errors.txt b/tests/baselines/reference/systemModule18.errors.txt
deleted file mode 100644
index ec1246650c923..0000000000000
--- a/tests/baselines/reference/systemModule18.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== index.ts (0 errors) ====
-    export import React = require("./react.js");
-    
-==== react.ts (0 errors) ====
-    export function createElement() {}
-    export function lazy() {}
-    export function useState() {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule2.errors.txt b/tests/baselines/reference/systemModule2.errors.txt
index a860f4ab1278c..c1ef2a8bab696 100644
--- a/tests/baselines/reference/systemModule2.errors.txt
+++ b/tests/baselines/reference/systemModule2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule2.ts(2,1): error TS1218: Export assignment is not supported when '--module' flag is 'system'.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule2.ts (1 errors) ====
     var x = 1;
     export = x;
diff --git a/tests/baselines/reference/systemModule3.errors.txt b/tests/baselines/reference/systemModule3.errors.txt
deleted file mode 100644
index ecb71076cde52..0000000000000
--- a/tests/baselines/reference/systemModule3.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export default function() {}
-    
-==== file2.ts (0 errors) ====
-    export default function f() {}
-    
-==== file3.ts (0 errors) ====
-    export default class C {}
-    
-==== file4.ts (0 errors) ====
-    export default class {}
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule4.errors.txt b/tests/baselines/reference/systemModule4.errors.txt
deleted file mode 100644
index b2b6905abca14..0000000000000
--- a/tests/baselines/reference/systemModule4.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule4.ts (0 errors) ====
-    export var x = 1;
-    export var y;
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule4.types b/tests/baselines/reference/systemModule4.types
index e029d2ca8449a..47145bb374727 100644
--- a/tests/baselines/reference/systemModule4.types
+++ b/tests/baselines/reference/systemModule4.types
@@ -9,5 +9,4 @@ export var x = 1;
 
 export var y;
 >y : any
->  : ^^^
 
diff --git a/tests/baselines/reference/systemModule5.errors.txt b/tests/baselines/reference/systemModule5.errors.txt
deleted file mode 100644
index 773df3c2216cf..0000000000000
--- a/tests/baselines/reference/systemModule5.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule5.ts (0 errors) ====
-    export function foo() {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule6.errors.txt b/tests/baselines/reference/systemModule6.errors.txt
deleted file mode 100644
index ebdac668ca854..0000000000000
--- a/tests/baselines/reference/systemModule6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule6.ts (0 errors) ====
-    export class C {}
-    function foo() {
-        new C();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule7.errors.txt b/tests/baselines/reference/systemModule7.errors.txt
deleted file mode 100644
index c77618db5038e..0000000000000
--- a/tests/baselines/reference/systemModule7.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule7.ts (0 errors) ====
-    // filename: instantiatedModule.ts
-    export namespace M {
-        var x = 1;
-    }
-    
-    // filename: nonInstantiatedModule.ts
-    export namespace M {
-        interface I {}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule8.errors.txt b/tests/baselines/reference/systemModule8.errors.txt
deleted file mode 100644
index 7c3d9634a2917..0000000000000
--- a/tests/baselines/reference/systemModule8.errors.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModule8.ts (0 errors) ====
-    export var x;
-    x = 1;
-    x++;
-    x--;
-    ++x;
-    --x;
-    x += 1;
-    x -= 1;
-    x *= 1;
-    x /= 1;
-    x |= 1;
-    x &= 1;
-    x + 1;
-    x - 1;
-    x & 1;
-    x | 1;
-    for (x = 5;;x++) {}
-    for (x = 8;;x--) {}
-    for (x = 15;;++x) {}
-    for (x = 18;;--x) {}
-    
-    for (let x = 50;;) {}
-    function foo() {
-        x = 100;
-    }
-    
-    export let [y] = [1];
-    export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}};
-    for ([x] of [[1]]) {}
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule8.types b/tests/baselines/reference/systemModule8.types
index 666f87c14d198..f6582cdf6c999 100644
--- a/tests/baselines/reference/systemModule8.types
+++ b/tests/baselines/reference/systemModule8.types
@@ -3,13 +3,11 @@
 === systemModule8.ts ===
 export var x;
 >x : any
->  : ^^^
 
 x = 1;
 >x = 1 : 1
 >      : ^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -17,31 +15,25 @@ x++;
 >x++ : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 x--;
 >x-- : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 ++x;
 >++x : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 --x;
 >--x : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 x += 1;
 >x += 1 : any
->       : ^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -49,7 +41,6 @@ x -= 1;
 >x -= 1 : number
 >       : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -57,7 +48,6 @@ x *= 1;
 >x *= 1 : number
 >       : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -65,7 +55,6 @@ x /= 1;
 >x /= 1 : number
 >       : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -73,7 +62,6 @@ x |= 1;
 >x |= 1 : number
 >       : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -81,15 +69,12 @@ x &= 1;
 >x &= 1 : number
 >       : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
 x + 1;
 >x + 1 : any
->      : ^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -97,7 +82,6 @@ x - 1;
 >x - 1 : number
 >      : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -105,7 +89,6 @@ x & 1;
 >x & 1 : number
 >      : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -113,7 +96,6 @@ x | 1;
 >x | 1 : number
 >      : ^^^^^^
 >x : any
->  : ^^^
 >1 : 1
 >  : ^
 
@@ -121,49 +103,41 @@ for (x = 5;;x++) {}
 >x = 5 : 5
 >      : ^
 >x : any
->  : ^^^
 >5 : 5
 >  : ^
 >x++ : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 for (x = 8;;x--) {}
 >x = 8 : 8
 >      : ^
 >x : any
->  : ^^^
 >8 : 8
 >  : ^
 >x-- : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 for (x = 15;;++x) {}
 >x = 15 : 15
 >       : ^^
 >x : any
->  : ^^^
 >15 : 15
 >   : ^^
 >++x : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 for (x = 18;;--x) {}
 >x = 18 : 18
 >       : ^^
 >x : any
->  : ^^^
 >18 : 18
 >   : ^^
 >--x : number
 >    : ^^^^^^
 >x : any
->  : ^^^
 
 for (let x = 50;;) {}
 >x : number
@@ -179,7 +153,6 @@ function foo() {
 >x = 100 : 100
 >        : ^^^
 >x : any
->  : ^^^
 >100 : 100
 >    : ^^^
 }
@@ -222,7 +195,6 @@ for ([x] of [[1]]) {}
 >[x] : [any]
 >    : ^^^^^
 >x : any
->  : ^^^
 >[[1]] : number[][]
 >      : ^^^^^^^^^^
 >[1] : number[]
diff --git a/tests/baselines/reference/systemModule9.errors.txt b/tests/baselines/reference/systemModule9.errors.txt
index 65c481584bf15..ed3c9e0d6c8fe 100644
--- a/tests/baselines/reference/systemModule9.errors.txt
+++ b/tests/baselines/reference/systemModule9.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 systemModule9.ts(1,21): error TS2792: Cannot find module 'file1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 systemModule9.ts(2,25): error TS2792: Cannot find module 'file2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 systemModule9.ts(3,15): error TS2792: Cannot find module 'file3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
@@ -8,7 +7,6 @@ systemModule9.ts(6,22): error TS2792: Cannot find module 'file6'. Did you mean t
 systemModule9.ts(16,15): error TS2792: Cannot find module 'file7'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== systemModule9.ts (7 errors) ====
     import * as ns from 'file1';
                         ~~~~~~~
diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt b/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
deleted file mode 100644
index 60c3e39b47409..0000000000000
--- a/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    declare class Promise { }
-    declare function Foo(): void;
-    declare class C {}
-    declare enum E {X = 1};
-    
-    export var promise = Promise;
-    export var foo = Foo;
-    export var c = C;
-    export var e = E;
-    
-==== file2.ts (0 errors) ====
-    export declare function foo();
-    
-==== file3.ts (0 errors) ====
-    export declare class C {}
-    
-==== file4.ts (0 errors) ====
-    export declare var v: number;
-    
-==== file5.ts (0 errors) ====
-    export declare enum E {X = 1}
-    
-==== file6.ts (0 errors) ====
-    export declare namespace M { var v: number; }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleConstEnums.errors.txt b/tests/baselines/reference/systemModuleConstEnums.errors.txt
deleted file mode 100644
index 44711f0c3ffdc..0000000000000
--- a/tests/baselines/reference/systemModuleConstEnums.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModuleConstEnums.ts (0 errors) ====
-    declare function use(a: any);
-    const enum TopLevelConstEnum { X }
-    
-    export function foo() {
-        use(TopLevelConstEnum.X);
-        use(M.NonTopLevelConstEnum.X);
-    }
-    
-    namespace M {
-        export const enum NonTopLevelConstEnum { X }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleConstEnums.types b/tests/baselines/reference/systemModuleConstEnums.types
index 8aac1421410be..c4bfff3998660 100644
--- a/tests/baselines/reference/systemModuleConstEnums.types
+++ b/tests/baselines/reference/systemModuleConstEnums.types
@@ -5,7 +5,6 @@ declare function use(a: any);
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >a : any
->  : ^^^
 
 const enum TopLevelConstEnum { X }
 >TopLevelConstEnum : TopLevelConstEnum
@@ -19,7 +18,6 @@ export function foo() {
 
     use(TopLevelConstEnum.X);
 >use(TopLevelConstEnum.X) : any
->                         : ^^^
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >TopLevelConstEnum.X : TopLevelConstEnum
@@ -31,7 +29,6 @@ export function foo() {
 
     use(M.NonTopLevelConstEnum.X);
 >use(M.NonTopLevelConstEnum.X) : any
->                              : ^^^
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >M.NonTopLevelConstEnum.X : M.NonTopLevelConstEnum
diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
deleted file mode 100644
index 2797a6292c8f1..0000000000000
--- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModuleConstEnumsSeparateCompilation.ts (0 errors) ====
-    declare function use(a: any);
-    const enum TopLevelConstEnum { X }
-    
-    export function foo() {
-        use(TopLevelConstEnum.X);
-        use(M.NonTopLevelConstEnum.X);
-    }
-    
-    namespace M {
-        export const enum NonTopLevelConstEnum { X }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
index ecbe54a5d6abf..15c786d6a85f4 100644
--- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
+++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
@@ -5,7 +5,6 @@ declare function use(a: any);
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >a : any
->  : ^^^
 
 const enum TopLevelConstEnum { X }
 >TopLevelConstEnum : TopLevelConstEnum
@@ -19,7 +18,6 @@ export function foo() {
 
     use(TopLevelConstEnum.X);
 >use(TopLevelConstEnum.X) : any
->                         : ^^^
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >TopLevelConstEnum.X : TopLevelConstEnum
@@ -31,7 +29,6 @@ export function foo() {
 
     use(M.NonTopLevelConstEnum.X);
 >use(M.NonTopLevelConstEnum.X) : any
->                              : ^^^
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >M.NonTopLevelConstEnum.X : M.NonTopLevelConstEnum
diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt b/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
deleted file mode 100644
index 17b0e359a5544..0000000000000
--- a/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModuleDeclarationMerging.ts (0 errors) ====
-    export function F() {}
-    export namespace F { var x; }
-    
-    export class C {}
-    export namespace C { var x; }
-    
-    export enum E {}
-    export namespace E { var x; }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.types b/tests/baselines/reference/systemModuleDeclarationMerging.types
index b55a85e37b5b4..85be2211c103d 100644
--- a/tests/baselines/reference/systemModuleDeclarationMerging.types
+++ b/tests/baselines/reference/systemModuleDeclarationMerging.types
@@ -9,7 +9,6 @@ export namespace F { var x; }
 >F : typeof F
 >  : ^^^^^^^^
 >x : any
->  : ^^^
 
 export class C {}
 >C : C
@@ -19,7 +18,6 @@ export namespace C { var x; }
 >C : typeof C
 >  : ^^^^^^^^
 >x : any
->  : ^^^
 
 export enum E {}
 >E : E
@@ -29,5 +27,4 @@ export namespace E { var x; }
 >E : typeof E
 >  : ^^^^^^^^
 >x : any
->  : ^^^
 
diff --git a/tests/baselines/reference/systemModuleExportDefault.errors.txt b/tests/baselines/reference/systemModuleExportDefault.errors.txt
deleted file mode 100644
index 900523915e198..0000000000000
--- a/tests/baselines/reference/systemModuleExportDefault.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (0 errors) ====
-    export default function() {}
-    
-==== file2.ts (0 errors) ====
-    export default function foo() {}
-    
-==== file3.ts (0 errors) ====
-    export default class {}
-    
-==== file4.ts (0 errors) ====
-    export default class C {}
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
deleted file mode 100644
index 9e8539c276faa..0000000000000
--- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModuleNonTopLevelModuleMembers.ts (0 errors) ====
-    export class TopLevelClass {}
-    export namespace TopLevelModule {var v;}
-    export function TopLevelFunction(): void {}
-    export enum TopLevelEnum {E}
-    
-    export namespace TopLevelModule2 {
-        export class NonTopLevelClass {}
-        export namespace NonTopLevelModule {var v;}
-        export function NonTopLevelFunction(): void {}
-        export enum NonTopLevelEnum {E}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types
index d608b8dd3b706..55d2770f41ac6 100644
--- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types
+++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types
@@ -9,7 +9,6 @@ export namespace TopLevelModule {var v;}
 >TopLevelModule : typeof TopLevelModule
 >               : ^^^^^^^^^^^^^^^^^^^^^
 >v : any
->  : ^^^
 
 export function TopLevelFunction(): void {}
 >TopLevelFunction : () => void
@@ -33,7 +32,6 @@ export namespace TopLevelModule2 {
 >NonTopLevelModule : typeof NonTopLevelModule
 >                  : ^^^^^^^^^^^^^^^^^^^^^^^^
 >v : any
->  : ^^^
 
     export function NonTopLevelFunction(): void {}
 >NonTopLevelFunction : () => void
diff --git a/tests/baselines/reference/systemModuleTargetES6.errors.txt b/tests/baselines/reference/systemModuleTargetES6.errors.txt
deleted file mode 100644
index ca92612515804..0000000000000
--- a/tests/baselines/reference/systemModuleTargetES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModuleTargetES6.ts (0 errors) ====
-    export class MyClass { }
-    export class MyClass2 {
-        static value = 42;
-        static getInstance() { return MyClass2.value; }
-    }
-    
-    export function myFunction() {
-        return new MyClass();
-    }
-    
-    export function myFunction2() {
-        return new MyClass2();
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleTrailingComments.errors.txt b/tests/baselines/reference/systemModuleTrailingComments.errors.txt
deleted file mode 100644
index ee1484af56df8..0000000000000
--- a/tests/baselines/reference/systemModuleTrailingComments.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemModuleTrailingComments.ts (0 errors) ====
-    export const test = "TEST";
-    
-    //some comment
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleWithSuperClass.errors.txt b/tests/baselines/reference/systemModuleWithSuperClass.errors.txt
deleted file mode 100644
index 2a624a94c08cc..0000000000000
--- a/tests/baselines/reference/systemModuleWithSuperClass.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== foo.ts (0 errors) ====
-    export class Foo {
-        a: string;
-    }
-    
-==== bar.ts (0 errors) ====
-    import {Foo} from './foo';
-    export class Bar extends Foo {
-        b: string;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemNamespaceAliasEmit.errors.txt b/tests/baselines/reference/systemNamespaceAliasEmit.errors.txt
deleted file mode 100644
index efdaea0144895..0000000000000
--- a/tests/baselines/reference/systemNamespaceAliasEmit.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== systemNamespaceAliasEmit.ts (0 errors) ====
-    namespace ns {
-        const value = 1;
-    }
-    
-    enum AnEnum {
-        ONE,
-        TWO
-    }
-    
-    export {ns, AnEnum, ns as FooBar, AnEnum as BarEnum};
\ No newline at end of file
diff --git a/tests/baselines/reference/systemObjectShorthandRename.errors.txt b/tests/baselines/reference/systemObjectShorthandRename.errors.txt
deleted file mode 100644
index 422691700e60f..0000000000000
--- a/tests/baselines/reference/systemObjectShorthandRename.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== x.ts (0 errors) ====
-    export const x = 'X'
-==== index.ts (0 errors) ====
-    import {x} from './x.js'
-    
-    const x2 = {x}
-    const a = {x2}
-    
-    const x3 = x
-    const b = {x3}
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).errors.txt b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).errors.txt
index 3309692a85958..21c68b1837718 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).errors.txt
+++ b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2015).errors.txt
@@ -1,10 +1,8 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 index.ts(2,1): error TS1378: Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'node20', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.
 index.ts(46,3): error TS1378: Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'node20', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.
 other.ts(9,5): error TS1432: Top-level 'for await' loops are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'node20', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== index.ts (2 errors) ====
     export const x = 1;
     await x;
diff --git a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).errors.txt b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).errors.txt
deleted file mode 100644
index ef1cdd0171809..0000000000000
--- a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).errors.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== index.ts (0 errors) ====
-    export const x = 1;
-    await x;
-    
-    // reparse element access as await
-    await [x];
-    await [x, x];
-    
-    // reparse call as await
-    declare function f(): number;
-    await (x);
-    await (f(), x);
-    await <number>(x);
-    await <number>(f(), x);
-    
-    // reparse tagged template as await
-    await ``;
-    await <string> ``;
-    
-    // member names should be ok
-    class C1 {
-        await() {}
-    }
-    class C2 {
-        get await() { return 1; }
-        set await(value) { }
-    }
-    class C3 {
-        await = 1;
-    }
-    ({
-        await() {}
-    });
-    ({
-        get await() { return 1 },
-        set await(value) { }
-    });
-    ({
-        await: 1
-    });
-    
-    // property access name should be ok
-    C1.prototype.await;
-    
-    // await in decorators
-    declare const dec: any;
-    @(await dec)
-    class C {
-    }
-    
-    // await allowed in aliased import
-    import { await as _await } from "./other";
-    
-    // newlines
-    // await in throw
-    throw await
-        1;
-    
-    // await in var
-    let y = await
-        1;
-    
-    // await in expression statement;
-    await
-        1;
-    
-==== other.ts (0 errors) ====
-    const _await = 1;
-    
-    // await allowed in aliased export
-    export { _await as await };
-    
-    // for-await-of
-    const arr = [Promise.resolve()];
-    
-    for await (const item of arr) {
-      item;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
index ac622b31610ca..f2a9992f6d32d 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
@@ -195,15 +195,11 @@ C1.prototype.await;
 // await in decorators
 declare const dec: any;
 >dec : any
->    : ^^^
 
 @(await dec)
 >(await dec) : any
->            : ^^^
 >await dec : any
->          : ^^^
 >dec : any
->    : ^^^
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/topLevelAwaitErrors.11.js b/tests/baselines/reference/topLevelAwaitErrors.11.js
index c332d24bd00a9..e21888aa30a33 100644
--- a/tests/baselines/reference/topLevelAwaitErrors.11.js
+++ b/tests/baselines/reference/topLevelAwaitErrors.11.js
@@ -11,9 +11,22 @@ export { _await as await };
 
 
 //// [other.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.await = void 0;
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+        }
+    };
+});
 //// [index.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+        }
+    };
+});
diff --git a/tests/baselines/reference/topLevelExports.errors.txt b/tests/baselines/reference/topLevelExports.errors.txt
deleted file mode 100644
index 52b401fa9fbb9..0000000000000
--- a/tests/baselines/reference/topLevelExports.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== topLevelExports.ts (0 errors) ====
-    export var foo = 3;
-    
-    function log(n:number) { return n;}
-    
-    void log(foo).toString();
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js
index f2e291f6c1586..ac6aa2a50784e 100644
--- a/tests/baselines/reference/topLevelLambda4.js
+++ b/tests/baselines/reference/topLevelLambda4.js
@@ -4,5 +4,11 @@
 export var x = () => this.window;
 
 //// [topLevelLambda4.js]
-var _this = this;
-export var x = function () { return _this.window; };
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _this = this;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    var x = function () { return _this.window; };
+    exports.x = x;
+});
diff --git a/tests/baselines/reference/topLevelVarHoistingSystem.errors.txt b/tests/baselines/reference/topLevelVarHoistingSystem.errors.txt
deleted file mode 100644
index 355957835b458..0000000000000
--- a/tests/baselines/reference/topLevelVarHoistingSystem.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== topLevelVarHoistingSystem.ts (0 errors) ====
-    if (false) {
-        var y = 1;
-    }
-    
-    function f() {
-        console.log(y);
-    }
-    
-    export { y };
\ No newline at end of file
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt b/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
deleted file mode 100644
index 4dd19f0bfab26..0000000000000
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-main.ts(3,21): error TS1055: Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-  Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' provides no match for the signature 'new <T>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): PromiseLike<T>'.
-main.ts(5,35): error TS1055: Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-  Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' provides no match for the signature 'new <T>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): PromiseLike<T>'.
-
-
-==== main.ts (2 errors) ====
-    // https://github.com/Microsoft/TypeScript/issues/11177
-    import * as Bluebird from 'bluebird';
-    async function a(): Bluebird<void> {
-                        ~~~~~~~~~~~~~~
-!!! error TS1055: Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-!!! error TS1055:   Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' provides no match for the signature 'new <T>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): PromiseLike<T>'.
-!!! related TS7038 main.ts:2:1: Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead.
-      try {
-        const b = async function b(): Bluebird<void> {
-                                      ~~~~~~~~~~~~~~
-!!! error TS1055: Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-!!! error TS1055:   Type '{ default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }' provides no match for the signature 'new <T>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): PromiseLike<T>'.
-!!! related TS7038 main.ts:2:1: Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead.
-          try {
-            await Bluebird.resolve(); // -- remove this and it compiles
-          } catch (error) { }
-        };
-    
-        await b(); // -- or remove this and it compiles
-      } catch (error) { }
-    }
-    
-==== bluebird.d.ts (0 errors) ====
-    declare module "bluebird" {
-        type Bluebird<T> = Promise<T>;
-        const Bluebird: typeof Promise;
-        export = Bluebird;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
index 8e2ab4802f6f1..03e601481e87c 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
@@ -24,39 +24,6 @@ declare module "bluebird" {
 
 //// [main.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -95,16 +62,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // https://github.com/Microsoft/TypeScript/issues/11177
-var Bluebird = __importStar(require("bluebird"));
+var Bluebird = require("bluebird");
 function a() {
-    return __awaiter(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, Bluebird, function () {
         var b, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 2, , 3]);
                     b = function b() {
-                        return __awaiter(this, void 0, void 0, function () {
+                        return __awaiter(this, void 0, Bluebird, function () {
                             var error_2;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.types b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
index 1e1e953f556ea..893ebeb88355e 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.types
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
@@ -3,8 +3,8 @@
 === main.ts ===
 // https://github.com/Microsoft/TypeScript/issues/11177
 import * as Bluebird from 'bluebird';
->Bluebird : { default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^                            ^^^                     ^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                                                     ^^^^^^^ ^^      ^^                            ^^^                   ^^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                           ^^^^^^^^^^^^^            ^^^^^^^^^ ^^^^^^^^^^      ^^^   ^^^          ^^^^^^^^^^^^^             ^^^^^^^^^^ ^^     ^^ ^^^                   ^^^^^^^^^^ ^^     ^^                  ^^^                   ^^^^^^^^^^^^^^^^^^^^                  ^^^
+>Bluebird : PromiseConstructor
+>         : ^^^^^^^^^^^^^^^^^^
 
 async function a(): Bluebird<void> {
 >a : () => Bluebird<void>
@@ -27,14 +27,13 @@ async function a(): Bluebird<void> {
 >                   : ^^^^^^^^^^^^^
 >Bluebird.resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >                 : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->Bluebird : { default: PromiseConstructor; all<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>; race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>; prototype: Promise<any>; reject<T = never>(reason?: any): Promise<T>; resolve(): Promise<void>; resolve<T>(value: T): Promise<Awaited<T>>; resolve<T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; [Symbol.species]: PromiseConstructor; }
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^      ^^                            ^^^                     ^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                                                     ^^^^^^^ ^^      ^^                            ^^^                   ^^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                           ^^^^^^^^^^^^^            ^^^^^^^^^ ^^^^^^^^^^      ^^^   ^^^          ^^^^^^^^^^^^^             ^^^^^^^^^^ ^^     ^^ ^^^                   ^^^^^^^^^^ ^^     ^^                  ^^^                   ^^^^^^^^^^^^^^^^^^^^                  ^^^
+>Bluebird : PromiseConstructor
+>         : ^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
 
       } catch (error) { }
 >error : any
->      : ^^^
 
     };
 
@@ -48,7 +47,6 @@ async function a(): Bluebird<void> {
 
   } catch (error) { }
 >error : any
->      : ^^^
 }
 
 === bluebird.d.ts ===
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js
index 66a5f725ad43c..cbdee94b59fe1 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js	
@@ -1,48 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js
index 66a5f725ad43c..cbdee94b59fe1 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js	
@@ -1,48 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index 66a5f725ad43c..cbdee94b59fe1 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -1,48 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js
index 66a5f725ad43c..cbdee94b59fe1 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js	
@@ -1,48 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var ng = __importStar(require("angular2/core"));
+var ng = require("angular2/core");
 var MyClass1 = /** @class */ (function () {
     function MyClass1(_elementRef) {
         this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.errors.txt b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.errors.txt
index 69abbac8e72aa..10079f19a0439 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.errors.txt	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.errors.txt	
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107:   Visit https://aka.ms/ts6 for migration information.
 ==== file.ts (0 errors) ====
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.errors.txt
index 69abbac8e72aa..10079f19a0439 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.errors.txt	
@@ -1,9 +1,7 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
   Visit https://aka.ms/ts6 for migration information.
 
 
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! error TS5107:   Visit https://aka.ms/ts6 for migration information.
 ==== file.ts (0 errors) ====
diff --git a/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).js b/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).js
index 65e255fa5c1f9..b9099960ddc61 100644
--- a/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).js	
+++ b/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).js	
@@ -1,39 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.alias = void 0;
 var a;
-exports.alias = __importStar(require("./file"));
+exports.alias = require("./file");
 //# sourceMappingURL=module.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.js b/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.js
index 65e255fa5c1f9..b9099960ddc61 100644
--- a/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.js	
+++ b/tests/baselines/reference/transpile/Export star as ns conflict does not crash (verbatimModuleSyntax=true).oldTranspile.js	
@@ -1,39 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.alias = void 0;
 var a;
-exports.alias = __importStar(require("./file"));
+exports.alias = require("./file");
 //# sourceMappingURL=module.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Export star as ns conflict does not crash.js b/tests/baselines/reference/transpile/Export star as ns conflict does not crash.js
index 65e255fa5c1f9..b9099960ddc61 100644
--- a/tests/baselines/reference/transpile/Export star as ns conflict does not crash.js	
+++ b/tests/baselines/reference/transpile/Export star as ns conflict does not crash.js	
@@ -1,39 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.alias = void 0;
 var a;
-exports.alias = __importStar(require("./file"));
+exports.alias = require("./file");
 //# sourceMappingURL=module.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Export star as ns conflict does not crash.oldTranspile.js b/tests/baselines/reference/transpile/Export star as ns conflict does not crash.oldTranspile.js
index 65e255fa5c1f9..b9099960ddc61 100644
--- a/tests/baselines/reference/transpile/Export star as ns conflict does not crash.oldTranspile.js	
+++ b/tests/baselines/reference/transpile/Export star as ns conflict does not crash.oldTranspile.js	
@@ -1,39 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.alias = void 0;
 var a;
-exports.alias = __importStar(require("./file"));
+exports.alias = require("./file");
 //# sourceMappingURL=module.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.errors.txt b/tests/baselines/reference/transpile/Generates module output.errors.txt
deleted file mode 100644
index b37ebfefd282d..0000000000000
--- a/tests/baselines/reference/transpile/Generates module output.errors.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    var x = 0; export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Generates module output.oldTranspile.errors.txt
deleted file mode 100644
index b37ebfefd282d..0000000000000
--- a/tests/baselines/reference/transpile/Generates module output.oldTranspile.errors.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    var x = 0; export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.errors.txt b/tests/baselines/reference/transpile/Rename dependencies - AMD.errors.txt
deleted file mode 100644
index 8d9b3dec5bd51..0000000000000
--- a/tests/baselines/reference/transpile/Rename dependencies - AMD.errors.txt	
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    import {foo} from "SomeName";
-    declare function use(a: any);
-    use(foo);
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - System.errors.txt b/tests/baselines/reference/transpile/Rename dependencies - System.errors.txt
deleted file mode 100644
index d44d2a643ba0a..0000000000000
--- a/tests/baselines/reference/transpile/Rename dependencies - System.errors.txt	
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    import {foo} from "SomeName";
-    declare function use(a: any);
-    use(foo);
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.errors.txt b/tests/baselines/reference/transpile/Rename dependencies - UMD.errors.txt
deleted file mode 100644
index c516802c09bd7..0000000000000
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.errors.txt	
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    import {foo} from "SomeName";
-    declare function use(a: any);
-    use(foo);
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt
index 1accaccbefd35..363afda18581b 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt
index 1accaccbefd35..363afda18581b 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt
index 1accaccbefd35..363afda18581b 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt
index 1accaccbefd35..363afda18581b 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'commonjs', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Sets module name.errors.txt b/tests/baselines/reference/transpile/Sets module name.errors.txt
deleted file mode 100644
index 28fdb1e333a68..0000000000000
--- a/tests/baselines/reference/transpile/Sets module name.errors.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    var x = 1; export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Sets module name.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Sets module name.oldTranspile.errors.txt
deleted file mode 100644
index 28fdb1e333a68..0000000000000
--- a/tests/baselines/reference/transpile/Sets module name.oldTranspile.errors.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.ts (0 errors) ====
-    var x = 1; export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js
index 6f4321710bfa2..34c99aba58054 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js
@@ -82,23 +82,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'...
 
-lib/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
 
-app/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/soltion/lib/module.js.map]
@@ -136,7 +123,7 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -177,32 +164,10 @@ declare const globalConst = 10;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file0.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./global.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1113
+  "size": 1072
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -229,7 +194,7 @@ declare const myVar = 30;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","-10505171738-export const z = 30;\nimport { x } from \"file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","-10505171738-export const z = 30;\nimport { x } from \"file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"outSignature":"-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -264,28 +229,10 @@ declare const myVar = 30;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../lib/module.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file3.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file4.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1161
+  "size": 1122
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
@@ -648,7 +595,7 @@ sourceFile:file4.ts
 >>>//# sourceMappingURL=module.d.ts.map
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: incremental-declaration-doesnt-change
 
@@ -663,26 +610,13 @@ Output::
     * lib/tsconfig.json
     * app/tsconfig.json
 
-[HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because buildinfo file 'lib/module.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because output 'lib/module.tsbuildinfo' is older than input 'lib/file1.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'...
 
-lib/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because buildinfo file 'app/module.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
-
-app/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
+[HH:MM:SS AM] Project 'app/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-Found 2 errors.
+[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/soltion/app/tsconfig.json'...
 
 
 
@@ -709,7 +643,7 @@ var globalConst = 10;
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-4405159098-export const x = 10;console.log(x);","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-4405159098-export const x = 10;console.log(x);","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -750,34 +684,13 @@ var globalConst = 10;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file0.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./global.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1127
+  "size": 1086
 }
 
+//// [/home/src/workspaces/soltion/app/module.tsbuildinfo] file changed its modified time
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
 ===================================================================
 JsFile: module.js
@@ -924,4 +837,4 @@ sourceFile:global.ts
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
index 22235dcc05e4d..d3ba2ff07f449 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
@@ -83,20 +83,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'...
 
-lib/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
 
-app/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 app/tsconfig.json:15:5 - error TS5102: Option 'prepend' has been removed. Please remove it from your configuration.
 
 15     {
@@ -109,7 +99,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -148,7 +138,7 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -189,32 +179,10 @@ declare const globalConst = 10;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file0.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./global.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1113
+  "size": 1072
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -660,7 +628,7 @@ sourceFile:file4.ts
 >>>//# sourceMappingURL=module.d.ts.map
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: incremental-declaration-doesnt-change
 
@@ -675,24 +643,14 @@ Output::
     * lib/tsconfig.json
     * app/tsconfig.json
 
-[HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because buildinfo file 'lib/module.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because output 'lib/module.tsbuildinfo' is older than input 'lib/file1.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'...
 
-lib/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because buildinfo file 'app/module.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
 
-app/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 app/tsconfig.json:15:5 - error TS5102: Option 'prepend' has been removed. Please remove it from your configuration.
 
 15     {
@@ -705,7 +663,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -732,7 +690,7 @@ var globalConst = 10;
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-4405159098-export const x = 10;console.log(x);","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-4405159098-export const x = 10;console.log(x);","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -773,32 +731,10 @@ var globalConst = 10;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file0.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./global.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n    export const x = 10;\n}\ndeclare module \"file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1127
+  "size": 1086
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
@@ -947,4 +883,4 @@ sourceFile:global.ts
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js
index de4af543d4a6b..014967a4d581f 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js
@@ -82,23 +82,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'...
 
-lib/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'...
 
-app/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/soltion/module.js.map]
@@ -136,7 +123,7 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/module.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./lib/file0.ts","./lib/file1.ts","./lib/file2.ts","./lib/global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","rootDir":"./","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n    export const x = 10;\n}\ndeclare module \"lib/file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./lib/file0.ts","./lib/file1.ts","./lib/file2.ts","./lib/global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","rootDir":"./","sourceMap":true,"strict":false,"target":1},"outSignature":"-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n    export const x = 10;\n}\ndeclare module \"lib/file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -178,32 +165,10 @@ declare const globalConst = 10;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./lib/file0.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./lib/file1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./lib/file2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./lib/global.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n    export const x = 10;\n}\ndeclare module \"lib/file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1150
+  "size": 1109
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -230,7 +195,7 @@ declare const myVar = 30;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n    export const x = 10;\n}\ndeclare module \"lib/file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","-16038404532-export const z = 30;\nimport { x } from \"lib/file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n    export const x = 10;\n}\ndeclare module \"lib/file2\" {\n    export const y = 20;\n}\ndeclare const globalConst = 10;\n","-16038404532-export const z = 30;\nimport { x } from \"lib/file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"outSignature":"-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -265,28 +230,10 @@ declare const myVar = 30;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../module.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file3.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file4.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-  "size": 1170
+  "size": 1131
 }
 
 //// [/home/src/workspaces/soltion/module.js.map.baseline.txt]
@@ -650,4 +597,4 @@ sourceFile:file4.ts
 >>>//# sourceMappingURL=module.d.ts.map
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js
index 8b78ce9f0633b..5fba70a5edab2 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options-with-incremental.js
@@ -45,14 +45,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -85,7 +77,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -121,30 +113,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 883
+  "size": 842
 }
 
 
@@ -169,11 +139,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -184,18 +159,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -228,7 +195,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -265,30 +232,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 900
+  "size": 859
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -317,11 +262,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -332,18 +277,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -376,7 +313,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -412,30 +349,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 883
+  "size": 842
 }
 
 
@@ -460,11 +375,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration, emit Dts and should not emit js
 
@@ -475,22 +390,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -527,30 +434,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 902
+  "size": 861
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -591,11 +476,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -606,22 +491,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -659,30 +536,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 924
+  "size": 883
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -727,11 +582,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -742,47 +597,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: local change
 
@@ -796,18 +616,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -840,7 +652,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -876,30 +688,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 884
+  "size": 843
 }
 
 
@@ -924,11 +714,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -939,22 +734,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -992,30 +779,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 925
+  "size": 884
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1044,11 +809,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -1059,47 +824,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with inlineSourceMap
 
@@ -1110,18 +840,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1154,7 +876,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1191,30 +913,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 907
+  "size": 866
 }
 
 
@@ -1240,11 +940,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -1255,18 +955,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1299,7 +991,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1336,30 +1028,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 901
+  "size": 860
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1388,11 +1058,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: emit js files
 
@@ -1403,18 +1073,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1447,7 +1109,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1483,30 +1145,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 884
+  "size": 843
 }
 
 
@@ -1531,11 +1171,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -1546,22 +1186,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1599,30 +1231,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 925
+  "size": 884
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1651,11 +1261,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap, should not re-emit
 
@@ -1666,46 +1276,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "declaration": true,
-  "declarationMap": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
index cd667d402a4a0..5761929243c7a 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
@@ -45,14 +45,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -100,7 +92,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -137,32 +129,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1183
+  "size": 1142
 }
 
 
@@ -187,11 +157,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -202,18 +177,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -246,7 +213,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -284,32 +251,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1200
+  "size": 1159
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -338,11 +283,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -353,18 +298,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -397,7 +334,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -434,32 +371,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1183
+  "size": 1142
 }
 
 
@@ -484,11 +399,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration should not emit anything
 
@@ -499,48 +414,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "declaration": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -551,47 +430,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -602,18 +446,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -632,7 +468,7 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -671,32 +507,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1224
+  "size": 1183
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map]
@@ -726,11 +540,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: should re-emit only dts so they dont contain sourcemap
 
@@ -741,18 +555,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -771,7 +577,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -808,32 +614,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1183
+  "size": 1142
 }
 
 
@@ -858,11 +642,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with emitDeclarationOnly should not emit anything
 
@@ -873,48 +657,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -925,47 +673,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: local change
 
@@ -979,18 +692,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1023,7 +728,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1060,32 +765,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1184
+  "size": 1143
 }
 
 
@@ -1110,11 +793,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with declaration should not emit anything
 
@@ -1125,48 +813,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts",
-  "/home/src/workspaces/project/c.ts",
-  "/home/src/workspaces/project/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "module": 2,
-  "declaration": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-/home/src/workspaces/project/c.ts
-/home/src/workspaces/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with inlineSourceMap
 
@@ -1177,18 +829,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1221,7 +865,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1259,32 +903,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1207
+  "size": 1166
 }
 
 
@@ -1310,11 +932,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -1325,18 +947,10 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1369,7 +983,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1407,32 +1021,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1201
+  "size": 1160
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1461,8 +1053,8 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js
index 9a4063ef8cb37..7461315fdd306 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental.js
@@ -73,20 +73,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output file 'project2/outFile.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -97,7 +87,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -117,7 +107,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -155,30 +145,8 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 919
+  "size": 878
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -281,7 +249,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -311,7 +284,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -323,24 +296,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/d.ts' is older than output 'project1/outFile.tsbuildinfo'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -351,38 +312,11 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -424,24 +358,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -452,13 +376,13 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -496,30 +420,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 933
+  "size": 892
 }
 
 
@@ -546,7 +448,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -576,7 +483,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: emit js files
 
@@ -588,24 +495,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -616,12 +513,12 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -659,30 +556,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 934
+  "size": 893
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
@@ -824,7 +699,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -854,7 +729,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -866,24 +741,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.tsbuildinfo'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -894,38 +757,11 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -964,24 +800,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.tsbuildinfo'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -992,38 +816,11 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": false,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -1065,24 +862,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd",
-                ~~~~~
-
 project2/src/tsconfig.json:10:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
 10     {
@@ -1093,13 +880,13 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","2355059555-export const b = 10;const bLocal = 10;const blocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","2355059555-export const b = 10;const bLocal = 10;const blocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1137,30 +924,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 951
+  "size": 910
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1218,7 +983,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1248,4 +1018,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js
index 544aff866e2af..90442e8d69e64 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline-with-declaration.js
@@ -71,20 +71,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output file 'project2/outFile.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -95,7 +85,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -115,7 +105,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -125,9 +115,8 @@ declare module "d" {
     "./src/c.ts",
     "./src/d.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 102
+  "size": 88
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -180,7 +169,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -209,7 +203,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -221,24 +215,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/d.ts' is older than output 'project1/outFile.d.ts'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -249,43 +231,14 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
-//// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "declaration": true,
-  "emitDeclarationOnly": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -326,24 +279,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -354,7 +297,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -387,7 +330,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -416,7 +364,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: emit js files
 
@@ -428,24 +376,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output file 'project1/outFile.js' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -456,7 +394,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -540,7 +478,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -569,7 +512,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -581,24 +524,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.d.ts'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -609,43 +540,14 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
-//// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "declaration": true,
-  "emitDeclarationOnly": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -683,24 +585,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.js'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -711,45 +601,15 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
-//// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.js] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.js] file written with same contents
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "declaration": true,
-  "emitDeclarationOnly": false,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -790,24 +650,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -818,7 +668,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -883,7 +733,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -912,4 +767,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js
index eab8ed7331472..1844fa0c3ce6e 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-false-on-commandline.js
@@ -71,23 +71,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output file 'project2/outFile.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -106,7 +93,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -144,32 +131,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1200
+  "size": 1159
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -185,7 +150,7 @@ declare module "g" {
 
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -222,32 +187,10 @@ declare module "g" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1317
+  "size": 1276
 }
 
 
@@ -273,7 +216,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -298,11 +246,16 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/outFile.d.ts
+/home/src/workspaces/solution/project2/src/e.ts
+/home/src/workspaces/solution/project2/src/f.ts
+/home/src/workspaces/solution/project2/src/g.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -314,82 +267,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/d.ts' is older than output 'project1/outFile.tsbuildinfo'
 
-
-Found 2 errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: change
 
@@ -404,31 +289,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-Found 2 errors.
+[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -466,34 +338,13 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1214
+  "size": 1173
 }
 
+//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 
 Program root files: [
   "/home/src/workspaces/solution/project1/src/a.ts",
@@ -517,36 +368,16 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
+Semantic diagnostics in builder refreshed for::
 /home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: emit js files
 
@@ -558,31 +389,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -620,36 +438,14 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1215
+  "size": 1174
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -686,32 +482,10 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1318
+  "size": 1277
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -788,7 +562,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -813,11 +587,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -829,82 +603,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.tsbuildinfo'
 
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no change run with js emit
 
@@ -916,82 +622,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
 
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
-
-
-
-
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": false,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": false,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: js emit with change
 
@@ -1006,31 +644,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","2355059555-export const b = 10;const bLocal = 10;const blocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","2355059555-export const b = 10;const bLocal = 10;const blocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":false,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1068,34 +693,13 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1232
+  "size": 1191
 }
 
+//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 //// [/home/src/workspaces/solution/project1/outFile.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -1150,33 +754,13 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": false,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
+Semantic diagnostics in builder refreshed for::
 /home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js
index 3aa93da46bb56..c6e19ddceea06 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration-and-incremental.js
@@ -71,20 +71,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output file 'project2/outFile.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -95,7 +85,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -115,7 +105,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -153,30 +143,8 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 919
+  "size": 878
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -279,7 +247,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -309,7 +282,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -321,24 +294,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/d.ts' is older than output 'project1/outFile.tsbuildinfo'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -349,38 +310,11 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -422,24 +356,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -450,13 +374,13 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -494,30 +418,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 933
+  "size": 892
 }
 
 
@@ -544,7 +446,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -574,7 +481,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: non local change
 
@@ -589,24 +496,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -617,7 +514,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -638,7 +535,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -676,30 +573,8 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 954
+  "size": 913
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -791,7 +666,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -821,7 +701,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: emit js files
 
@@ -833,24 +713,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -861,12 +731,12 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -903,30 +773,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 927
+  "size": 886
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
@@ -1067,7 +915,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -1096,7 +944,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -1108,24 +956,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.tsbuildinfo'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -1136,38 +972,11 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "incremental": true,
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -1209,24 +1018,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -1237,13 +1036,13 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-2761163262-export const b = 10;const bLocal = 10;const alocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-2761163262-export const b = 10;const bLocal = 10;const alocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1280,30 +1079,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 945
+  "size": 904
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1361,7 +1138,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1390,7 +1172,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: local change
 
@@ -1405,24 +1187,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -1433,13 +1205,13 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-3037017594-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-3037017594-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1477,30 +1249,8 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 988
+  "size": 947
 }
 
 
@@ -1527,7 +1277,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1557,7 +1312,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: non local change
 
@@ -1572,24 +1327,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -1600,7 +1345,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -1622,7 +1367,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-7233149715-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-7233149715-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1660,30 +1405,8 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 1012
+  "size": 971
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -1775,7 +1498,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1805,7 +1533,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1820,24 +1548,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:9:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  9     {
@@ -1848,7 +1566,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -1871,7 +1589,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-18124257118-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;export const a2 = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-18124257118-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;export const a2 = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1908,30 +1626,8 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 1007
+  "size": 966
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -2057,7 +1753,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -2086,4 +1787,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js
index 261f974a69333..b8b34234bffe9 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline-with-declaration.js
@@ -69,20 +69,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output file 'project2/outFile.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -93,7 +83,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -113,7 +103,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -123,9 +113,8 @@ declare module "d" {
     "./src/c.ts",
     "./src/d.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 102
+  "size": 88
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -178,7 +167,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -207,7 +201,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -219,24 +213,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/d.ts' is older than output 'project1/outFile.d.ts'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -247,43 +229,14 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
-//// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -324,24 +277,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -352,7 +295,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -385,7 +328,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -414,7 +362,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: non local change
 
@@ -429,24 +377,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -457,7 +395,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -505,7 +443,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -534,7 +477,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: emit js files
 
@@ -546,24 +489,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output file 'project1/outFile.js' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -574,7 +507,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -658,7 +591,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -686,7 +624,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -698,24 +636,12 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.d.ts'
 
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -726,43 +652,14 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
-//// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file written with same contents
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "declaration": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
 Program root files: [
   "/home/src/workspaces/solution/project2/src/e.ts",
   "/home/src/workspaces/solution/project2/src/f.ts",
@@ -803,24 +700,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -831,7 +718,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -896,7 +783,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -924,7 +816,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: local change
 
@@ -939,24 +831,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -967,7 +849,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -1000,7 +882,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1029,7 +916,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: non local change
 
@@ -1044,24 +931,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -1072,7 +949,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -1121,7 +998,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1150,7 +1032,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1165,24 +1047,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -1193,7 +1065,7 @@ Output::
    ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
@@ -1278,7 +1150,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1306,4 +1183,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
index 3a649d5537421..be9c50ba4dd23 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
@@ -69,23 +69,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 [HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output file 'project2/outFile.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -104,7 +91,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -142,32 +129,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1200
+  "size": 1159
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -183,7 +148,7 @@ declare module "g" {
 
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -220,32 +185,10 @@ declare module "g" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1317
+  "size": 1276
 }
 
 
@@ -271,7 +214,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -296,11 +244,16 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/outFile.d.ts
+/home/src/workspaces/solution/project2/src/e.ts
+/home/src/workspaces/solution/project2/src/f.ts
+/home/src/workspaces/solution/project2/src/g.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -312,82 +265,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/d.ts' is older than output 'project1/outFile.tsbuildinfo'
 
-
-Found 2 errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: local change
 
@@ -402,31 +287,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-
-Found 2 errors.
+[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16597586570-export const a = 10;const aLocal = 10;const aa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -464,34 +336,13 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1214
+  "size": 1173
 }
 
+//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 
 Program root files: [
   "/home/src/workspaces/solution/project1/src/a.ts",
@@ -515,36 +366,16 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
+Semantic diagnostics in builder refreshed for::
 /home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: non local change
 
@@ -559,27 +390,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output 'project2/outFile.tsbuildinfo' is older than input 'project1/src'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -599,7 +417,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -637,36 +455,14 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1260
+  "size": 1219
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -703,32 +499,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1342
+  "size": 1301
 }
 
 
@@ -754,7 +528,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -779,11 +558,16 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/outFile.d.ts
+/home/src/workspaces/solution/project2/src/e.ts
+/home/src/workspaces/solution/project2/src/f.ts
+/home/src/workspaces/solution/project2/src/g.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: emit js files
 
@@ -795,31 +579,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -856,36 +627,14 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1233
+  "size": 1192
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -921,32 +670,10 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1315
+  "size": 1274
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1023,7 +750,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -1047,11 +774,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -1063,82 +790,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
-
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is up to date because newest input 'project1/src/a.ts' is older than output 'project1/outFile.tsbuildinfo'
 
-Found 2 errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/solution/project1/src/a.ts",
-  "/home/src/workspaces/solution/project1/src/b.ts",
-  "/home/src/workspaces/solution/project1/src/c.ts",
-  "/home/src/workspaces/solution/project1/src/d.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project1/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project1/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/src/a.ts
-/home/src/workspaces/solution/project1/src/b.ts
-/home/src/workspaces/solution/project1/src/c.ts
-/home/src/workspaces/solution/project1/src/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1153,31 +812,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-5     "module": "amd"
-                ~~~~~
-
-
-Found 2 errors.
+[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-2761163262-export const b = 10;const bLocal = 10;const alocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-2761163262-export const b = 10;const bLocal = 10;const alocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1214,34 +860,13 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1251
+  "size": 1210
 }
 
+//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 //// [/home/src/workspaces/solution/project1/outFile.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -1296,35 +921,16 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
+Semantic diagnostics in builder refreshed for::
 /home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: local change
 
@@ -1339,31 +945,18 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
-
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-
-Found 2 errors.
+[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-3037017594-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-3037017594-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1401,34 +994,13 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "106974224-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1294
+  "size": 1253
 }
 
+//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 
 Program root files: [
   "/home/src/workspaces/solution/project1/src/a.ts",
@@ -1452,36 +1024,16 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-Program root files: [
-  "/home/src/workspaces/solution/project2/src/e.ts",
-  "/home/src/workspaces/solution/project2/src/f.ts",
-  "/home/src/workspaces/solution/project2/src/g.ts"
-]
-Program options: {
-  "composite": true,
-  "outFile": "/home/src/workspaces/solution/project2/outFile.js",
-  "module": 2,
-  "emitDeclarationOnly": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/solution/project2/src/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
+Semantic diagnostics in builder refreshed for::
 /home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/project1/outFile.d.ts
-/home/src/workspaces/solution/project2/src/e.ts
-/home/src/workspaces/solution/project2/src/f.ts
-/home/src/workspaces/solution/project2/src/g.ts
-
-No cached semantic diagnostics in the builder::
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: non local change
 
@@ -1496,27 +1048,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because output 'project1/outFile.tsbuildinfo' is older than input 'project1/src/b.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output 'project2/outFile.tsbuildinfo' is older than input 'project1/src'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -1537,7 +1076,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-7233149715-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-3908737535-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-7233149715-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-3908737535-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1575,36 +1114,14 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-3908737535-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1350
+  "size": 1309
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3908737535-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3908737535-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"emitDeclarationOnly":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1641,32 +1158,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1374
+  "size": 1333
 }
 
 
@@ -1692,7 +1187,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1717,11 +1217,16 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/outFile.d.ts
+/home/src/workspaces/solution/project2/src/e.ts
+/home/src/workspaces/solution/project2/src/f.ts
+/home/src/workspaces/solution/project2/src/g.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1736,27 +1241,14 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project1/src/tsconfig.json' is out of date because buildinfo file 'project1/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project1/src/tsconfig.json'...
 
-project1/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because buildinfo file 'project2/outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
 
-project2/src/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -1778,7 +1270,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-18124257118-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;export const a2 = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"1646858368-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n    export const a2 = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;","-18124257118-export const b = 10;const bLocal = 10;const alocal = 10;const aaaa = 10;export const aaaaa = 10;export const a2 = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"1646858368-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n    export const a2 = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1815,36 +1307,14 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "1646858368-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n    export const a2 = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1371
+  "size": 1330
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1646858368-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n    export const a2 = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1646858368-declare module \"a\" {\n    export const a = 10;\n    export const aaa = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n    export const aaaaa = 10;\n    export const a2 = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","-13789510868-export const e = 10;","-4849089835-import { a } from \"a\"; export const f = a;","-18341999015-import { b } from \"b\"; export const g = b;"],"root":[[3,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1880,32 +1350,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/outfile.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/e.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/f.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/g.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12964815745-declare module \"e\" {\n    export const e = 10;\n}\ndeclare module \"f\" {\n    export const f = 10;\n}\ndeclare module \"g\" {\n    export const g = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1373
+  "size": 1332
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1966,7 +1414,12 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/src/a.ts
+/home/src/workspaces/solution/project1/src/b.ts
+/home/src/workspaces/solution/project1/src/c.ts
+/home/src/workspaces/solution/project1/src/d.ts
 
 No shapes updated in the builder::
 
@@ -1990,8 +1443,13 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/solution/project1/outFile.d.ts
+/home/src/workspaces/solution/project2/src/e.ts
+/home/src/workspaces/solution/project2/src/f.ts
+/home/src/workspaces/solution/project2/src/g.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file-discrepancies.js b/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file-discrepancies.js
index df06354e36341..5b8da24e4ba02 100644
--- a/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file-discrepancies.js
@@ -27,6 +27,7 @@ CleanBuild:
   },
   "outSignature": "-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
   "latestChangedDtsFile": "FakeFileName",
+  "errors": true,
   "version": "FakeTSVersion"
 }
 IncrementalBuild:
@@ -53,5 +54,6 @@ IncrementalBuild:
   },
   "outSignature": "-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
   "latestChangedDtsFile": "FakeFileName",
+  "errors": true,
   "version": "FakeTSVersion"
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js b/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
index 7da423b2683d2..95e0e31dc6df5 100644
--- a/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
+++ b/tests/baselines/reference/tsbuild/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
@@ -37,18 +37,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
-tsconfig.json:5:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5   "module": "amd"
-              ~~~~~
-
 tsconfig.json:10:9 - error TS1005: ',' expected.
 
 10         "b.ts"
            ~~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -77,7 +72,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4646078106-export function foo() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4646078106-export function foo() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -106,24 +101,11 @@ declare module "b" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 903
+  "size": 880
 }
 
 
@@ -150,18 +132,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
-tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6   "module": "amd"
-              ~~~~~
-
 tsconfig.json:11:9 - error TS1005: ',' expected.
 
 11         "b.ts"
            ~~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -177,18 +154,13 @@ export function foo() { }export function fooBar() { }
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
-tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6   "module": "amd"
-              ~~~~~
-
 tsconfig.json:11:9 - error TS1005: ',' expected.
 
 11         "b.ts"
            ~~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -220,7 +192,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9819159940-export function foo() { }export function fooBar() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-12543119676-declare module \"a\" {\n    export function foo(): void;\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9819159940-export function foo() { }export function fooBar() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"declaration":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12543119676-declare module \"a\" {\n    export function foo(): void;\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -250,24 +222,11 @@ declare module "b" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-12543119676-declare module \"a\" {\n    export function foo(): void;\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 988
+  "size": 965
 }
 
 
@@ -279,18 +238,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
-tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6   "module": "amd"
-              ~~~~~
-
 tsconfig.json:11:9 - error TS1005: ',' expected.
 
 11         "b.ts"
            ~~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -317,15 +271,44 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --b
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
+//// [/home/src/workspaces/outFile.tsbuildinfo]
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","9819159940-export function foo() { }export function fooBar() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"declaration":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-12543119676-declare module \"a\" {\n    export function foo(): void;\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../tslibs/ts/lib/lib.d.ts",
+    "./project/a.ts",
+    "./project/b.ts"
+  ],
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "9819159940-export function foo() { }export function fooBar() { }",
+    "./project/b.ts": "1045484683-export function bar() { }"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "outSignature": "-12543119676-declare module \"a\" {\n    export function foo(): void;\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
+  "version": "FakeTSVersion",
+  "size": 951
+}
+
+
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
index a16c343766c08..b5e69974ec6c9 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
@@ -57,11 +57,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -71,25 +66,21 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/project/outFile.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define("index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
-    ky_1 = __importDefault(ky_1);
     exports.api = ky_1.default.extend({});
 });
 
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","10101889135-type KyInstance = {\n    extend(options: Record<string,unknown>): KyInstance;\n}\ndeclare const ky: KyInstance;\nexport default ky;\n","-383421929-import ky from 'ky';\nexport const api = ky.extend({});\n"],"root":[3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js","skipDefaultLibCheck":true,"skipLibCheck":true},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[3,[{"start":34,"length":3,"messageText":"Exported variable 'api' has or is using name 'KyInstance' from external module \"/home/src/workspaces/project/ky\" but cannot be named.","category":1,"code":4023}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","10101889135-type KyInstance = {\n    extend(options: Record<string,unknown>): KyInstance;\n}\ndeclare const ky: KyInstance;\nexport default ky;\n","-383421929-import ky from 'ky';\nexport const api = ky.extend({});\n"],"root":[3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js","skipDefaultLibCheck":true,"skipLibCheck":true},"emitDiagnosticsPerFile":[[3,[{"start":34,"length":3,"messageText":"Exported variable 'api' has or is using name 'KyInstance' from external module \"/home/src/workspaces/project/ky\" but cannot be named.","category":1,"code":4023}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -116,20 +107,6 @@ define("index", ["require", "exports", "ky"], function (require, exports, ky_1)
     "skipDefaultLibCheck": true,
     "skipLibCheck": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./ky.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/index.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./src/index.ts",
@@ -145,7 +122,7 @@ define("index", ["require", "exports", "ky"], function (require, exports, ky_1)
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1131
+  "size": 1094
 }
 
 
@@ -169,11 +146,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 ky.d.ts
@@ -181,7 +153,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors.
+Found 1 error.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js
index 91dc0a9777687..3511845632291 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/outFile/reports-dts-generation-errors.js
@@ -56,11 +56,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -72,19 +67,15 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/project/outFile.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define("index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
-    ky_1 = __importDefault(ky_1);
     exports.api = ky_1.default.extend({});
 });
 
@@ -123,11 +114,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -139,7 +125,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
diff --git a/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js b/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js
index 4672a8a05ce02..482dbfd1fc6a2 100644
--- a/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js
+++ b/tests/baselines/reference/tsbuild/fileDelete/outFile/deleted-file-without-composite.js
@@ -48,11 +48,6 @@ Output::
 Module resolution kind is not specified, using 'Classic'.
 File '/home/src/workspaces/solution/child/child2.ts' exists - use it as a name resolution result.
 ======== Module name '../child/child2' was successfully resolved to '/home/src/workspaces/solution/child/child2.ts'. ========
-child/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd"
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 child/child2.ts
@@ -60,9 +55,6 @@ child/child2.ts
   Matched by default include pattern '**/*'
 child/child.ts
   Matched by default include pattern '**/*'
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/solution/childResult.js]
@@ -84,7 +76,7 @@ define("child", ["require", "exports", "child2"], function (require, exports, ch
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
-{"root":["./child/child.ts","./child/child2.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./child/child.ts","./child/child2.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -92,13 +84,12 @@ define("child", ["require", "exports", "child2"], function (require, exports, ch
     "./child/child.ts",
     "./child/child2.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 89
+  "size": 75
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: delete child2 file
 
@@ -110,7 +101,7 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * child/tsconfig.json
 
-[HH:MM:SS AM] Project 'child/tsconfig.json' is out of date because buildinfo file 'childResult.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'child/tsconfig.json' is out of date because buildinfo file 'childResult.tsbuildinfo' indicates that file 'child/child2.ts' was root file of compilation but not any more.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/child/tsconfig.json'...
 
@@ -122,10 +113,10 @@ File '/home/src/workspaces/solution/child/child2.d.ts' does not exist.
 File '/home/src/workspaces/solution/child/child2.js' does not exist.
 File '/home/src/workspaces/solution/child/child2.jsx' does not exist.
 ======== Module name '../child/child2' was not resolved. ========
-child/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+child/child.ts:1:24 - error TS2792: Cannot find module '../child/child2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
-4     "module": "amd"
-                ~~~~~
+1 import { child2 } from "../child/child2";
+                         ~~~~~~~~~~~~~~~~~
 
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
diff --git a/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js b/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
index c0459fea5a1ea..2dc516d8c7ea3 100644
--- a/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
+++ b/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
@@ -71,11 +71,6 @@ Output::
 Module resolution kind is not specified, using 'Classic'.
 File '/home/src/workspaces/solution/child/child2.ts' exists - use it as a name resolution result.
 ======== Module name '../child/child2' was successfully resolved to '/home/src/workspaces/solution/child/child2.ts'. ========
-child/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 child/child2.ts
@@ -127,20 +122,12 @@ File '/home/child.jsx' does not exist.
 File '/child.js' does not exist.
 File '/child.jsx' does not exist.
 ======== Module name 'child' was not resolved. ========
-main/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 childResult.d.ts
   Output from referenced project 'child/tsconfig.json' included because '--outFile' specified
 main/main.ts
   Matched by default include pattern '**/*'
-
-Found 2 errors.
-
 
 
 //// [/home/src/workspaces/solution/childResult.js]
@@ -171,7 +158,7 @@ declare module "child" {
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child2.ts","./child/child.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","6507293504-export function child2() {\n}\n","-11458139532-import { child2 } from \"../child/child2\";\nexport function child() {\n    child2();\n}\n"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./childResult.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"2074776633-declare module \"child2\" {\n    export function child2(): void;\n}\ndeclare module \"child\" {\n    export function child(): void;\n}\n","latestChangedDtsFile":"./childResult.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child2.ts","./child/child.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","6507293504-export function child2() {\n}\n","-11458139532-import { child2 } from \"../child/child2\";\nexport function child() {\n    child2();\n}\n"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./childResult.js"},"outSignature":"2074776633-declare module \"child2\" {\n    export function child2(): void;\n}\ndeclare module \"child\" {\n    export function child(): void;\n}\n","latestChangedDtsFile":"./childResult.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -200,24 +187,10 @@ declare module "child" {
     "module": 2,
     "outFile": "./childResult.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./child/child2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./child/child.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "2074776633-declare module \"child2\" {\n    export function child2(): void;\n}\ndeclare module \"child\" {\n    export function child(): void;\n}\n",
   "latestChangedDtsFile": "./childResult.d.ts",
   "version": "FakeTSVersion",
-  "size": 1005
+  "size": 968
 }
 
 //// [/home/src/workspaces/solution/mainResult.js]
@@ -238,7 +211,7 @@ declare module "main" {
 
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","2074776633-declare module \"child2\" {\n    export function child2(): void;\n}\ndeclare module \"child\" {\n    export function child(): void;\n}\n","-8784613407-import { child } from \"child\";\nexport function main() {\n    child();\n}\n"],"root":[3],"options":{"composite":true,"module":2,"outFile":"./mainResult.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"7955277823-declare module \"main\" {\n    export function main(): void;\n}\n","latestChangedDtsFile":"./mainResult.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","2074776633-declare module \"child2\" {\n    export function child2(): void;\n}\ndeclare module \"child\" {\n    export function child(): void;\n}\n","-8784613407-import { child } from \"child\";\nexport function main() {\n    child();\n}\n"],"root":[3],"options":{"composite":true,"module":2,"outFile":"./mainResult.js"},"outSignature":"7955277823-declare module \"main\" {\n    export function main(): void;\n}\n","latestChangedDtsFile":"./mainResult.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -263,28 +236,14 @@ declare module "main" {
     "module": 2,
     "outFile": "./mainResult.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./childresult.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./main/main.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "7955277823-declare module \"main\" {\n    export function main(): void;\n}\n",
   "latestChangedDtsFile": "./mainResult.d.ts",
   "version": "FakeTSVersion",
-  "size": 1020
+  "size": 983
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: delete child2 file
 
@@ -297,7 +256,7 @@ Output::
     * child/tsconfig.json
     * main/tsconfig.json
 
-[HH:MM:SS AM] Project 'child/tsconfig.json' is out of date because buildinfo file 'childResult.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'child/tsconfig.json' is out of date because buildinfo file 'childResult.tsbuildinfo' indicates that file 'child/child2.ts' was root file of compilation but not any more.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/child/tsconfig.json'...
 
@@ -309,16 +268,16 @@ File '/home/src/workspaces/solution/child/child2.d.ts' does not exist.
 File '/home/src/workspaces/solution/child/child2.js' does not exist.
 File '/home/src/workspaces/solution/child/child2.jsx' does not exist.
 ======== Module name '../child/child2' was not resolved. ========
-child/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+child/child.ts:1:24 - error TS2792: Cannot find module '../child/child2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
-5     "module": "amd"
-                ~~~~~
+1 import { child2 } from "../child/child2";
+                         ~~~~~~~~~~~~~~~~~
 
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 child/child.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Project 'main/tsconfig.json' is out of date because buildinfo file 'mainResult.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'main/tsconfig.json' is out of date because output 'mainResult.tsbuildinfo' is older than input 'child'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/main/tsconfig.json'...
 
@@ -362,11 +321,6 @@ File '/home/child.jsx' does not exist.
 File '/child.js' does not exist.
 File '/child.jsx' does not exist.
 ======== Module name 'child' was not resolved. ========
-main/tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 childResult.d.ts
@@ -374,7 +328,7 @@ childResult.d.ts
 main/main.ts
   Matched by default include pattern '**/*'
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -396,7 +350,7 @@ declare module "child" {
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11458139532-import { child2 } from \"../child/child2\";\nexport function child() {\n    child2();\n}\n"],"root":[2],"options":{"composite":true,"module":2,"outFile":"./childResult.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"8966811613-declare module \"child\" {\n    export function child(): void;\n}\n","latestChangedDtsFile":"./childResult.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11458139532-import { child2 } from \"../child/child2\";\nexport function child() {\n    child2();\n}\n"],"root":[2],"options":{"composite":true,"module":2,"outFile":"./childResult.js"},"semanticDiagnosticsPerFile":[[2,[{"start":23,"length":17,"messageText":"Cannot find module '../child/child2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?","category":1,"code":2792}]]],"outSignature":"8966811613-declare module \"child\" {\n    export function child(): void;\n}\n","latestChangedDtsFile":"./childResult.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -420,24 +374,28 @@ declare module "child" {
     "outFile": "./childResult.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./child/child.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 23,
+          "length": 17,
+          "messageText": "Cannot find module '../child/child2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?",
+          "category": 1,
+          "code": 2792
+        }
+      ]
     ]
   ],
   "outSignature": "8966811613-declare module \"child\" {\n    export function child(): void;\n}\n",
   "latestChangedDtsFile": "./childResult.d.ts",
   "version": "FakeTSVersion",
-  "size": 867
+  "size": 1079
 }
 
 //// [/home/src/workspaces/solution/mainResult.js] file written with same contents
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","8966811613-declare module \"child\" {\n    export function child(): void;\n}\n","-8784613407-import { child } from \"child\";\nexport function main() {\n    child();\n}\n"],"root":[3],"options":{"composite":true,"module":2,"outFile":"./mainResult.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"7955277823-declare module \"main\" {\n    export function main(): void;\n}\n","latestChangedDtsFile":"./mainResult.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","8966811613-declare module \"child\" {\n    export function child(): void;\n}\n","-8784613407-import { child } from \"child\";\nexport function main() {\n    child();\n}\n"],"root":[3],"options":{"composite":true,"module":2,"outFile":"./mainResult.js"},"outSignature":"7955277823-declare module \"main\" {\n    export function main(): void;\n}\n","latestChangedDtsFile":"./mainResult.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -462,25 +420,11 @@ declare module "child" {
     "module": 2,
     "outFile": "./mainResult.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./childresult.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./main/main.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "7955277823-declare module \"main\" {\n    export function main(): void;\n}\n",
   "latestChangedDtsFile": "./mainResult.d.ts",
   "version": "FakeTSVersion",
-  "size": 951
+  "size": 914
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js
index dac0625965da4..15a9070f44f38 100644
--- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js
+++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js
@@ -126,13 +126,10 @@ export declare class LazyAction<TAction extends (...args: any[]) => any, TModule
 
 //// [/home/src/workspaces/project/obj/lazyIndex.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = void 0;
 var bar_1 = require("./bar");
-Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
 
 
 //// [/home/src/workspaces/project/obj/lazyIndex.d.ts]
@@ -141,44 +138,11 @@ export { default as bar } from './bar';
 
 //// [/home/src/workspaces/project/obj/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyBar = void 0;
 var bundling_1 = require("./bundling");
 var lazyModule = new bundling_1.LazyModule(function () {
-    return Promise.resolve().then(function () { return __importStar(require('./lazyIndex')); });
+    return Promise.resolve().then(function () { return require('./lazyIndex'); });
 });
 exports.lazyBar = new bundling_1.LazyAction(lazyModule, function (m) { return m.bar; });
 
diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js
index fc8c35a240e3b..fcde6caa19994 100644
--- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js
+++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js
@@ -126,13 +126,10 @@ export declare class LazyAction<TAction extends (...args: any[]) => any, TModule
 
 //// [/home/src/workspaces/project/obj/lazyIndex.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = void 0;
 var bar_1 = require("./bar");
-Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
 
 
 //// [/home/src/workspaces/project/obj/lazyIndex.d.ts]
@@ -141,44 +138,11 @@ export { default as bar } from './bar';
 
 //// [/home/src/workspaces/project/obj/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyBar = void 0;
 var bundling_1 = require("./bundling");
 var lazyModule = new bundling_1.LazyModule(function () {
-    return Promise.resolve().then(function () { return __importStar(require('./lazyIndex')); });
+    return Promise.resolve().then(function () { return require('./lazyIndex'); });
 });
 exports.lazyBar = new bundling_1.LazyAction(lazyModule, function (m) { return m.bar; });
 
diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js
index 1e3ace7c532e9..085e41591691f 100644
--- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js
+++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js
@@ -128,14 +128,11 @@ export declare class LazyAction<TAction extends (...args: any[]) => any, TModule
 
 //// [/home/src/workspaces/project/obj/lazyIndex.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = void 0;
 var bar_1 = require("./bar");
-Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
-var bar_2 = __importDefault(require("./bar"));
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
+var bar_2 = require("./bar");
 (0, bar_2.default)("hello");
 
 
@@ -145,44 +142,11 @@ export { default as bar } from './bar';
 
 //// [/home/src/workspaces/project/obj/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyBar = void 0;
 var bundling_1 = require("./bundling");
 var lazyModule = new bundling_1.LazyModule(function () {
-    return Promise.resolve().then(function () { return __importStar(require('./lazyIndex')); });
+    return Promise.resolve().then(function () { return require('./lazyIndex'); });
 });
 exports.lazyBar = new bundling_1.LazyAction(lazyModule, function (m) { return m.bar; });
 
@@ -834,14 +798,11 @@ Output::
 
 //// [/home/src/workspaces/project/obj/lazyIndex.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = void 0;
 var bar_1 = require("./bar");
-Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
-var bar_2 = __importDefault(require("./bar"));
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } });
+var bar_2 = require("./bar");
 (0, bar_2.default)();
 
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js
index e859968afda99..9858bf4d0684b 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js
@@ -8,7 +8,6 @@ CleanBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
@@ -18,7 +17,6 @@ IncrementalBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion"
 }
 15:: no-change-run
@@ -32,7 +30,6 @@ CleanBuild:
     "./project/b.ts",
     "./project/c.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js
index 6ccf068c0fb44..e7ac3f1ec1788 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental.js
@@ -50,13 +50,8 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -210,14 +205,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -317,7 +304,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -348,18 +335,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -388,22 +367,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -425,11 +390,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -440,44 +408,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts"
-]
-Program options: {
-  "declaration": true,
-  "incremental": true,
-  "module": 2,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -521,13 +457,8 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
 
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -688,18 +619,13 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
 
-
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -728,20 +654,6 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -766,7 +678,7 @@ Found 2 errors.
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 
@@ -788,7 +700,10 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
@@ -810,14 +725,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -909,7 +816,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -924,18 +831,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -964,22 +863,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -1001,11 +886,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -1019,14 +907,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'c.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1055,7 +943,7 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1090,25 +978,21 @@ define("c", ["require", "exports"], function (require, exports) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -1144,7 +1028,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1176,13 +1064,8 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-5     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -1337,14 +1220,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1453,7 +1328,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1468,10 +1343,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1479,7 +1354,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1514,25 +1389,21 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1556,7 +1427,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1591,10 +1466,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1622,7 +1497,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
index 5d554bd98bff9..fcbb3f0c1bd05 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
@@ -49,15 +49,10 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -144,15 +139,10 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -200,14 +190,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -225,8 +207,20 @@ define("b", ["require", "exports"], function (require, exports) {
 });
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/workspaces/outFile.tsbuildinfo]
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
+
+//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./project/a.ts",
+    "./project/b.ts"
+  ],
+  "checkPending": true,
+  "version": "FakeTSVersion",
+  "size": 90
+}
+
 //// [/home/src/workspaces/outFile.d.ts]
 declare module "a" {
     export const a = "hello";
@@ -259,7 +253,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -290,19 +284,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -310,9 +296,8 @@ Found 1 error.
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 84
+  "size": 70
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -334,11 +319,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -349,47 +337,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
 
 
 
-//// [/home/src/workspaces/outFile.js] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
-//// [/home/src/workspaces/outFile.d.ts] file written with same contents
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts"
-]
-Program options: {
-  "declaration": true,
-  "module": 2,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -433,15 +386,10 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -545,15 +493,10 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -591,7 +534,10 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
@@ -613,14 +559,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -639,7 +577,7 @@ define("b", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -647,10 +585,9 @@ define("b", ["require", "exports"], function (require, exports) {
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 104
+  "size": 90
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -677,7 +614,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -692,19 +629,11 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -712,9 +641,8 @@ Found 1 error.
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 84
+  "size": 70
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -736,11 +664,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -754,14 +685,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'c.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -836,7 +767,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -868,15 +803,10 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -966,14 +896,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -997,8 +919,21 @@ define("c", ["require", "exports"], function (require, exports) {
 });
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/workspaces/outFile.tsbuildinfo]
+{"root":["./project/a.ts","./project/b.ts","./project/c.ts"],"checkPending":true,"version":"FakeTSVersion"}
+
+//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts"
+  ],
+  "checkPending": true,
+  "version": "FakeTSVersion",
+  "size": 107
+}
+
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 
 Program root files: [
@@ -1025,7 +960,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1040,10 +975,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1087,7 +1022,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1122,10 +1061,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1156,7 +1095,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js
index e859968afda99..9858bf4d0684b 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js
@@ -8,7 +8,6 @@ CleanBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
@@ -18,7 +17,6 @@ IncrementalBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion"
 }
 15:: no-change-run
@@ -32,7 +30,6 @@ CleanBuild:
     "./project/b.ts",
     "./project/c.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js
index 272860dfe5d74..f61c8f26744cb 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental.js
@@ -40,14 +40,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -147,7 +139,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -181,14 +173,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -274,7 +258,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -305,18 +289,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -345,22 +321,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -382,11 +344,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -397,44 +362,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts"
-]
-Program options: {
-  "declaration": true,
-  "incremental": true,
-  "module": 2,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -468,14 +401,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -561,7 +486,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -592,10 +517,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -603,7 +528,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11705693502-export const a: number = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11705693502-export const a: number = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -633,21 +558,21 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 722
+  "size": 837
 }
 
 
@@ -669,7 +594,10 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
@@ -691,14 +619,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -784,7 +704,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -799,18 +719,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -839,22 +751,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -876,11 +774,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -894,14 +795,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'c.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -942,7 +843,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -977,25 +878,21 @@ declare module "c" {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1019,7 +916,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1041,14 +942,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -1148,7 +1041,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix `a` error with noCheck
 
@@ -1166,14 +1059,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -1273,7 +1158,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1288,10 +1173,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1299,7 +1184,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1334,25 +1219,21 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1376,7 +1257,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1411,10 +1296,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1442,7 +1327,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
index b6360482a8884..dd33c43127ba5 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
@@ -39,14 +39,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -74,7 +66,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -82,10 +74,9 @@ declare module "b" {
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 104
+  "size": 90
 }
 
 
@@ -111,7 +102,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -145,14 +136,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -190,7 +173,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -221,20 +204,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -242,9 +217,8 @@ Found 1 error.
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 84
+  "size": 70
 }
 
 
@@ -265,11 +239,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -280,47 +257,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
 
 
 
-//// [/home/src/workspaces/outFile.js] file written with same contents
-//// [/home/src/workspaces/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
-
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts"
-]
-Program options: {
-  "declaration": true,
-  "module": 2,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -354,14 +296,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -375,7 +309,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -383,10 +317,9 @@ declare module "b" {
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 104
+  "size": 90
 }
 
 
@@ -412,7 +345,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -443,10 +376,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -487,7 +420,10 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
@@ -509,14 +445,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -530,7 +458,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -538,10 +466,9 @@ declare module "b" {
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 104
+  "size": 90
 }
 
 
@@ -567,7 +494,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -582,20 +509,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -603,9 +522,8 @@ Found 1 error.
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 84
+  "size": 70
 }
 
 
@@ -626,11 +544,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -644,14 +565,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'c.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -726,7 +647,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -748,14 +673,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -772,7 +689,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts","./project/c.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts","./project/c.ts"],"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -781,10 +698,9 @@ declare module "c" {
     "./project/b.ts",
     "./project/c.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 121
+  "size": 107
 }
 
 
@@ -812,7 +728,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix `a` error with noCheck
 
@@ -830,14 +746,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -880,7 +788,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -895,10 +803,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -942,7 +850,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -977,10 +889,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1011,7 +923,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js
index e859968afda99..9858bf4d0684b 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js
@@ -8,7 +8,6 @@ CleanBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
@@ -18,7 +17,6 @@ IncrementalBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion"
 }
 15:: no-change-run
@@ -32,7 +30,6 @@ CleanBuild:
     "./project/b.ts",
     "./project/c.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js
index 2eba32763e7a9..48f3e4dac129a 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental.js
@@ -181,14 +181,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -280,7 +272,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -311,18 +303,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -351,22 +335,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -388,11 +358,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -403,44 +376,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts"
-]
-Program options: {
-  "declaration": true,
-  "incremental": true,
-  "module": 2,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -703,14 +644,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -802,7 +735,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -817,18 +750,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -857,22 +782,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -894,11 +805,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -912,14 +826,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'c.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -960,7 +874,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -995,25 +909,21 @@ declare module "c" {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1037,7 +947,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1193,14 +1107,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1309,7 +1215,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1324,10 +1230,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1335,7 +1241,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1370,25 +1276,21 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1412,7 +1314,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1447,10 +1353,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1478,7 +1384,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
index bfb5962318e77..df224cb5d6208 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
@@ -145,14 +145,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -171,8 +163,20 @@ define("b", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/workspaces/outFile.tsbuildinfo]
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
+
+//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./project/a.ts",
+    "./project/b.ts"
+  ],
+  "checkPending": true,
+  "version": "FakeTSVersion",
+  "size": 90
+}
+
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -196,7 +200,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -227,20 +231,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -248,9 +244,8 @@ Found 1 error.
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 84
+  "size": 70
 }
 
 
@@ -271,11 +266,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -286,47 +284,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
 
 
 
-//// [/home/src/workspaces/outFile.js] file written with same contents
-//// [/home/src/workspaces/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
-
-Program root files: [
-  "/home/src/workspaces/project/a.ts",
-  "/home/src/workspaces/project/b.ts"
-]
-Program options: {
-  "declaration": true,
-  "module": 2,
-  "outFile": "/home/src/workspaces/outFile.js",
-  "tscBuild": true,
-  "configFilePath": "/home/src/workspaces/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/project/a.ts
-/home/src/workspaces/project/b.ts
-
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -521,14 +484,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -548,7 +503,7 @@ define("b", ["require", "exports"], function (require, exports) {
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -556,10 +511,9 @@ define("b", ["require", "exports"], function (require, exports) {
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 104
+  "size": 90
 }
 
 
@@ -585,7 +539,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -600,20 +554,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -621,9 +567,8 @@ Found 1 error.
     "./project/a.ts",
     "./project/b.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 84
+  "size": 70
 }
 
 
@@ -644,11 +589,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -662,14 +610,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'c.ts'
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -744,7 +692,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -857,14 +809,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -889,8 +833,21 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo] file written with same contents
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/home/src/workspaces/outFile.tsbuildinfo]
+{"root":["./project/a.ts","./project/b.ts","./project/c.ts"],"checkPending":true,"version":"FakeTSVersion"}
+
+//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts"
+  ],
+  "checkPending": true,
+  "version": "FakeTSVersion",
+  "size": 107
+}
+
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -916,7 +873,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -931,10 +888,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -978,7 +935,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1013,10 +974,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
 Found 1 error.
@@ -1047,7 +1008,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
index aca35ce903e0d..d2b9ecd537355 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
@@ -60,10 +60,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -141,7 +141,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,39 +185,24 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 
@@ -236,18 +221,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -262,18 +239,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error but still noEmit
 
@@ -293,18 +262,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -347,13 +331,73 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/directuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/indirectuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
   "version": "FakeTSVersion",
-  "size": 1822
+  "size": 2613
 }
 
 
@@ -377,10 +421,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -389,7 +433,7 @@ Found 1 error.
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -433,39 +477,24 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 
@@ -484,10 +513,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -510,18 +539,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -536,18 +557,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -562,10 +575,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -593,13 +606,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -674,7 +707,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -718,39 +751,68 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1849
+  "size": 2595
 }
 
 
@@ -769,13 +831,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -795,13 +877,28 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors.
 
 
 
@@ -821,13 +918,28 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors.
 
 
 
@@ -847,13 +959,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -878,18 +1010,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -932,17 +1056,33 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
+  ],
   "version": "FakeTSVersion",
-  "size": 1822
+  "size": 2034
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -957,10 +1097,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -1038,7 +1178,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1082,39 +1222,24 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 
@@ -1133,18 +1258,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -1159,18 +1276,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -1185,10 +1294,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
index e3b8cfca0d7e1..a077d50fea902 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
@@ -61,10 +61,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -142,7 +142,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -186,37 +186,22 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 
@@ -235,18 +220,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -261,18 +238,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error but still noEmit
 
@@ -292,18 +261,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -346,11 +330,71 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/directuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/indirectuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | Dts",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1273
+  "size": 2064
 }
 
 
@@ -374,10 +418,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -387,7 +431,7 @@ Found 1 error.
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -431,37 +475,22 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 
@@ -480,10 +509,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -506,18 +535,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -532,18 +553,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -558,10 +571,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -589,13 +602,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -670,7 +703,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -714,37 +747,66 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1298
+  "size": 2044
 }
 
 
@@ -763,13 +825,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -789,13 +871,28 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors.
 
 
 
@@ -815,13 +912,28 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors.
 
 
 
@@ -841,13 +953,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -872,18 +1004,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -926,15 +1050,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1271
+  "size": 1483
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -949,10 +1089,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -1030,7 +1170,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1074,37 +1214,22 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 
@@ -1123,18 +1248,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -1149,18 +1266,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -1175,10 +1284,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
index 10dac7542edd4..8f2ad2d8b8510 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
@@ -60,10 +60,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -121,7 +121,7 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -164,37 +164,22 @@ function someFunc(arguments) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 
@@ -213,18 +198,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -239,18 +216,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error but still noEmit
 
@@ -270,18 +239,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -323,11 +307,71 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/directuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/indirectuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1254
+  "size": 2045
 }
 
 
@@ -351,10 +395,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -363,7 +407,7 @@ Found 1 error.
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -406,37 +450,22 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 
@@ -455,10 +484,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -481,18 +510,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -507,18 +528,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -533,10 +546,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -564,13 +577,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -625,7 +658,7 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -668,37 +701,66 @@ function someFunc(arguments) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1279
+  "size": 2025
 }
 
 
@@ -717,13 +779,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -743,13 +825,28 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors.
 
 
 
@@ -769,13 +866,28 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors.
 
 
 
@@ -795,13 +907,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
@@ -826,18 +958,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -879,15 +1003,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1252
+  "size": 1467
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -902,10 +1042,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -963,7 +1103,7 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1006,37 +1146,22 @@ function someFunc(arguments) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 
@@ -1055,18 +1180,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -1081,18 +1198,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -1107,10 +1216,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js
index cba73748f6d41..37a94e14df5df 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-composite.js
@@ -60,18 +60,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,4,3,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -114,21 +106,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/src/class.ts",
-    "./project/src/directuse.ts",
-    "./project/src/indirectclass.ts",
-    "./project/src/indirectuse.ts",
-    "./project/src/nochangefile.ts",
-    "./project/src/nochangefilewithemitspecificerror.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1281
+  "size": 1481
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -143,10 +145,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -154,7 +156,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -198,39 +200,24 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -324,18 +311,38 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -379,39 +386,68 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1849
+  "size": 2595
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -505,18 +541,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -559,17 +587,33 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
+  ],
   "version": "FakeTSVersion",
-  "size": 1822
+  "size": 2034
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -584,10 +628,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -595,7 +639,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -639,39 +683,24 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 //// [/home/src/workspaces/outFile.js]
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
index ff4b44068dc7d..2df30dd3a279b 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
@@ -61,18 +61,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,4,3,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -115,21 +107,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/src/class.ts",
-    "./project/src/directuse.ts",
-    "./project/src/indirectclass.ts",
-    "./project/src/indirectuse.ts",
-    "./project/src/nochangefile.ts",
-    "./project/src/nochangefilewithemitspecificerror.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1283
+  "size": 1483
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -144,10 +146,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -155,7 +157,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -199,37 +201,22 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -323,18 +310,38 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -378,37 +385,66 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1298
+  "size": 2044
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -502,18 +538,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -556,15 +584,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1271
+  "size": 1483
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -579,10 +623,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -590,7 +634,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -634,37 +678,22 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 //// [/home/src/workspaces/outFile.js]
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js
index c03f1c0eed7f8..9d81185e29c7b 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-with-initial-noEmit-incremental.js
@@ -60,18 +60,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,4,3,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -113,21 +105,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/src/class.ts",
-    "./project/src/directuse.ts",
-    "./project/src/indirectclass.ts",
-    "./project/src/indirectuse.ts",
-    "./project/src/nochangefile.ts",
-    "./project/src/nochangefilewithemitspecificerror.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1264
+  "size": 1467
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -142,10 +144,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -153,7 +155,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -196,37 +198,22 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -300,18 +287,38 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error.
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -354,37 +361,66 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1279
+  "size": 2025
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -458,18 +494,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -511,15 +539,31 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1252
+  "size": 1467
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -534,10 +578,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
 Found 1 error.
@@ -545,7 +589,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -588,37 +632,22 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 //// [/home/src/workspaces/outFile.js]
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js
index 7a7a540bcded3..5639fd1e7b940 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js
@@ -53,4 +53,53 @@ IncrementalBuild:
 7:: With declaration and declarationMap noEmit
 Clean build will have declaration and declarationMap
 Incremental build will have previous buildInfo so will have declaration and declarationMap
-*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
+TsBuild info text without affectedFilesPendingEmit:: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-9483521475-export const a = class { public p = 10; };",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "declarationMap": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-9483521475-export const a = class { public p = 10; };",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js
index 5919e2af67c87..468c246fa4547 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules.js
@@ -39,18 +39,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -78,13 +70,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 697
+  "size": 693
 }
 
 
@@ -106,11 +97,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -121,44 +115,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'b.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -169,14 +131,19 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -184,7 +151,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -213,13 +180,35 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 1015
 }
 
 
@@ -242,7 +231,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -261,10 +250,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -272,7 +266,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -302,13 +296,35 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 738
+  "size": 1037
 }
 
 
@@ -332,7 +348,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -347,44 +363,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'b.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Dts Emit with error
 
@@ -409,18 +393,13 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -449,20 +428,6 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -487,7 +452,7 @@ Found 2 errors.
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 //// [/home/src/projects/outFile.js]
@@ -529,7 +494,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -547,22 +512,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -590,8 +547,9 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 692
@@ -616,11 +574,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: With declaration enabled noEmit
 
@@ -631,22 +592,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -675,11 +628,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 711
+  "size": 708
 }
 
 
@@ -702,11 +656,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: With declaration and declarationMap noEmit
 
@@ -717,81 +671,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-Found 1 error.
-
-
 
-//// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
 
-//// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-9483521475-export const a = class { public p = 10; };",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "declarationMap": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "changeFileSet": [
-    "./project/a.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 733
-}
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "declaration": true,
-  "declarationMap": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
index 063b9b86b1cb9..9f34ed3460a73 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
@@ -45,18 +45,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,4,5,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -92,15 +84,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts",
-    "./project/d.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 853
+  "size": 845
 }
 
 
@@ -126,11 +115,16 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
+/home/src/projects/project/c.ts
+/home/src/projects/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -141,48 +135,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts",
-  "/home/src/projects/project/c.ts",
-  "/home/src/projects/project/d.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-/home/src/projects/project/c.ts
-/home/src/projects/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -193,22 +151,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-Found 1 error.
+1 export const c = class { private p = 10; };
+               ~
+
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
+
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
+
+
+Found 3 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,4,5,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -245,15 +228,77 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts",
-    "./project/d.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 872
+  "size": 1725
 }
 
 
@@ -280,7 +325,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -299,18 +344,43 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-Found 1 error.
+1 export const c = class { private p = 10; };
+               ~
+
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
+
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
+
+
+Found 3 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,4,5,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -348,15 +418,77 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts",
-    "./project/d.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 894
+  "size": 1747
 }
 
 
@@ -384,7 +516,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -399,48 +531,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts",
-  "/home/src/projects/project/c.ts",
-  "/home/src/projects/project/d.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-/home/src/projects/project/c.ts
-/home/src/projects/project/d.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Dts Emit with error
 
@@ -485,18 +581,13 @@ Output::
                    ~
     Add a type annotation to the variable d.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 4 errors.
+Found 3 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -533,28 +624,6 @@ Found 4 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -621,7 +690,7 @@ Found 4 errors.
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1749
+  "size": 1708
 }
 
 //// [/home/src/projects/outFile.js]
@@ -689,7 +758,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -707,22 +776,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -758,8 +819,9 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 844
@@ -788,11 +850,16 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
+/home/src/projects/project/c.ts
+/home/src/projects/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: With declaration enabled noEmit
 
@@ -803,22 +870,37 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates there is change in compilerOptions
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c = class { private p = 10; };
+               ~
 
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
 
-Found 1 error.
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
+
+
+Found 2 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -855,11 +937,56 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 863
+  "size": 1445
 }
 
 
@@ -886,7 +1013,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -905,18 +1032,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c = class { private p = 10; };
+               ~
 
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
 
-Found 1 error.
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
+
+
+Found 2 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -954,11 +1096,56 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 885
+  "size": 1467
 }
 
 
@@ -986,7 +1173,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -1008,10 +1195,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const d = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
 
 
 Found 1 error.
@@ -1019,7 +1211,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-15184115393-export const c = class { public p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-15184115393-export const c = class { public p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1057,12 +1249,35 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/c.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 886
+  "size": 1187
 }
 
 
@@ -1090,7 +1305,12 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
+/home/src/projects/project/c.ts
+/home/src/projects/project/d.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
deleted file mode 100644
index c31c43cffeb6f..0000000000000
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
+++ /dev/null
@@ -1,103 +0,0 @@
-7:: no-change-run
-*** Needs explanation
-Incremental build contains ./project/a.ts file has emit errors, clean build does not have errors or does not mark is as pending emit: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
-Incremental buildInfoText:: {
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-9502176711-export const a = class { private p = 10; };",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 13,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "version": "FakeTSVersion",
-  "size": 1035
-}
-Clean buildInfoText:: {
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-9502176711-export const a = class { private p = 10; };",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 716
-}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index fddf6ae22e533..accc40a0a3935 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -40,10 +40,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -51,7 +56,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -80,13 +85,35 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 1015
 }
 
 
@@ -109,7 +136,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -128,10 +158,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -158,7 +193,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -180,18 +215,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -220,13 +247,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 701
+  "size": 694
 }
 
 
@@ -249,11 +275,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -264,45 +293,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "declaration": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -313,22 +309,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -357,22 +345,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 //// [/home/src/projects/outFile.js]
@@ -418,11 +392,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -433,45 +407,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "declaration": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -485,14 +426,19 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -500,7 +446,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -529,11 +475,35 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 712
+  "size": 1015
 }
 
 
@@ -556,7 +526,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -585,18 +558,13 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -625,20 +593,6 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -663,7 +617,7 @@ Found 2 errors.
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 //// [/home/src/projects/outFile.js]
@@ -705,7 +659,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -724,10 +678,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -754,7 +713,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index 74533959dac20..990b2ff3c0dcb 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -39,18 +39,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -78,13 +70,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 697
+  "size": 693
 }
 
 
@@ -106,11 +97,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -121,44 +115,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'b.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix error
 
@@ -172,22 +134,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,13 +169,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -243,11 +196,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -258,44 +214,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -306,22 +230,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -349,22 +265,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -400,11 +302,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -415,44 +317,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -466,22 +336,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -509,8 +371,9 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 693
@@ -535,11 +398,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit when error
 
@@ -550,22 +416,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -593,22 +451,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 710
+  "size": 673
 }
 
 //// [/home/src/projects/outFile.js]
@@ -649,11 +493,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -664,41 +508,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index f16f138b4c510..7ecd2f6978625 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -39,10 +39,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
 Found 1 error.
@@ -50,7 +50,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -78,13 +78,26 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 689
+  "size": 837
 }
 
 
@@ -106,7 +119,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -125,10 +141,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
 Found 1 error.
@@ -154,7 +170,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -176,18 +192,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,13 +223,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -243,11 +250,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -258,44 +268,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -306,22 +284,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -349,22 +319,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -400,11 +356,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -415,44 +371,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -466,14 +390,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
 Found 1 error.
@@ -481,7 +405,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -509,11 +433,26 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 685
+  "size": 837
 }
 
 
@@ -535,7 +474,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -554,10 +496,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
 Found 1 error.
@@ -565,7 +507,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -594,21 +536,21 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 702
+  "size": 817
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -630,7 +572,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -649,10 +591,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
 Found 1 error.
@@ -678,7 +620,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index 1057c3a035d98..5357ede56a5d0 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -176,18 +176,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,13 +207,12 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -243,11 +234,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -258,44 +252,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -306,22 +268,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -349,22 +303,8 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -400,11 +340,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -415,44 +355,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/home/src/projects/project/a.ts",
-  "/home/src/projects/project/b.ts"
-]
-Program options: {
-  "outFile": "/home/src/projects/outFile.js",
-  "module": 2,
-  "incremental": true,
-  "noEmit": true,
-  "tscBuild": true,
-  "configFilePath": "/home/src/projects/project/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/project/a.ts
-/home/src/projects/project/b.ts
-
-No cached semantic diagnostics in the builder::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -466,7 +374,7 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
index 6d65f93f39b08..e27041cdcc1b4 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
@@ -51,10 +51,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
+
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -62,7 +67,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"emitDiagnosticsPerFile":[[3,[{"start":53,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":53,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -97,13 +102,35 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "emitDiagnosticsPerFile": [
+    [
+      "./noemitonerror/src/main.ts",
+      [
+        {
+          "start": 53,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 53,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
   "pendingEmit": [
-    "Js | Dts",
-    false
+    "Js | DtsEmit",
+    17
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 945
+  "size": 1234
 }
 
 
@@ -151,10 +178,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+2 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -207,18 +239,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -253,15 +277,51 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 937
+  "size": 903
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -292,7 +352,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -303,44 +363,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js
index 38c1815b13046..43631105c5984 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-declaration.js
@@ -50,10 +50,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
+
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -119,10 +124,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+2 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
 Found 1 error.
@@ -180,18 +190,63 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -221,7 +276,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -232,49 +287,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js
index 9ef1c63913944..037ab8916250e 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors-with-incremental.js
@@ -50,18 +50,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -95,13 +110,8 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 926
+  "size": 892
 }
 
 
@@ -133,7 +143,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -144,46 +154,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/other.ts' is older than output '../dev-build.tsbuildinfo'
 
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-Semantic diagnostics in builder refreshed for::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix error
 
@@ -199,22 +175,15 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -248,13 +217,8 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 918
+  "size": 884
 }
 
 
@@ -286,7 +250,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -297,43 +261,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
-
-
-
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-Semantic diagnostics in builder refreshed for::
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
index 82d4752d1bba9..1749492ea84fd 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
@@ -49,18 +49,33 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"errors":true,"version":"FakeTSVersion"}
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -69,9 +84,8 @@ Found 1 error.
     "./noemitonerror/src/main.ts",
     "./noemitonerror/src/other.ts"
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 148
+  "size": 134
 }
 
 
@@ -102,7 +116,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -113,51 +127,12 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/other.ts' is older than output '../dev-build.js'
 
-
-Found 1 error.
-
-
-
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
-
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix error
 
@@ -173,20 +148,13 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
 
@@ -217,7 +185,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -228,48 +196,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
 
-Found 1 error.
-
-
-
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
-
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
index 955fc8f9629b9..51a983dd14dde 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
@@ -55,13 +55,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -173,13 +168,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -228,18 +218,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -274,15 +256,39 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 895
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -313,7 +319,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -324,44 +330,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js
index fbd78fb48c6a9..e7dddf6eaf83d 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-declaration.js
@@ -54,13 +54,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -128,13 +123,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -188,18 +178,51 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -229,7 +252,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -240,49 +263,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
 
-
-Found 1 error.
-
-
-
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
-
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js
index 0d80588b62c85..966a72bbddf4c 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors-with-incremental.js
@@ -54,13 +54,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -170,13 +165,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -224,18 +214,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -269,15 +251,27 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 910
+  "size": 876
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -307,7 +301,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -318,43 +312,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
index 278dd2b2ff77c..3f49f32e38cfa 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
@@ -53,13 +53,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -126,13 +121,8 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -185,18 +175,39 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -225,7 +236,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -236,48 +247,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
index 1b2399b57b703..3fb01e5f53e1b 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
@@ -58,13 +58,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -163,13 +158,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -220,18 +210,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -266,15 +248,41 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 938
+  "size": 904
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -305,7 +313,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -316,44 +324,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js
index 0a6ade00a5341..a990242f50e9b 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-declaration.js
@@ -57,13 +57,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -131,13 +126,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -193,18 +183,53 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -234,7 +259,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -245,49 +270,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
 
-
-Found 1 error.
-
-
-
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
-
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
 
-No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js
index 5a7b166e6b876..3d7a1e5b9ca17 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors-with-incremental.js
@@ -57,13 +57,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -160,13 +155,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -216,18 +206,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -261,15 +243,29 @@ Found 1 error.
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 919
+  "size": 885
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -299,7 +295,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -310,43 +306,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
 
 
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
index 09b9aff40858d..5ff22472e468e 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
@@ -56,13 +56,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
-
-
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -129,13 +124,8 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -190,18 +180,41 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
-
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -230,7 +243,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -241,48 +254,9 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "noEmitOnError": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-No shapes updated in the builder::
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js b/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js
index 5eba8a1b00c04..6c94df77fa760 100644
--- a/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js
+++ b/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js
@@ -139,32 +139,14 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/first/tsconfig.json'...
 
-first/tsconfig.json:4:34 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "composite": true, "module": "none",
-                                   ~~~~~~
-
 [HH:MM:SS AM] Project 'second/tsconfig.json' is out of date because output file 'second/tsconfig.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/second/tsconfig.json'...
 
-second/tsconfig.json:4:34 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "composite": true, "module": "none",
-                                   ~~~~~~
-
 [HH:MM:SS AM] Project 'third/tsconfig.json' is out of date because output file 'third/tsconfig.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/third/tsconfig.json'...
 
-third/tsconfig.json:4:34 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "composite": true, "module": "none",
-                                   ~~~~~~
-
-
-Found 3 errors.
-
 
 
 //// [/home/src/workspaces/solution/first/first_PART1.js.map]
@@ -218,7 +200,7 @@ declare function f(): string;
 //# sourceMappingURL=first_part3.d.ts.map
 
 //// [/home/src/workspaces/solution/first/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./first_part1.ts","./first_part2.ts","./first_part3.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","signature":"-14851202444-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\n","affectsGlobalScope":true},{"version":"6007494133-console.log(f());\n","signature":"5381-","affectsGlobalScope":true},{"version":"4357625305-function f() {\n    return \"JS does hoists\";\n}\n","signature":"-6420944280-declare function f(): string;\n","affectsGlobalScope":true}],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./first_part3.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./first_part1.ts","./first_part2.ts","./first_part3.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-22071182994-interface TheFirst {\n    none: any;\n}\n\nconst s = \"Hello, world\";\n\ninterface NoJsForHereEither {\n    none: any;\n}\n\nconsole.log(s);\n","signature":"-14851202444-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\n","affectsGlobalScope":true},{"version":"6007494133-console.log(f());\n","signature":"5381-","affectsGlobalScope":true},{"version":"4357625305-function f() {\n    return \"JS does hoists\";\n}\n","signature":"-6420944280-declare function f(): string;\n","affectsGlobalScope":true}],"root":[[2,4]],"options":{"composite":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"latestChangedDtsFile":"./first_part3.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/first/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,27 +274,9 @@ declare function f(): string;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./first_part1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./first_part2.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./first_part3.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./first_part3.d.ts",
   "version": "FakeTSVersion",
-  "size": 1442
+  "size": 1403
 }
 
 //// [/home/src/workspaces/solution/second/second_part1.js.map]
@@ -362,7 +326,7 @@ declare class C {
 //# sourceMappingURL=second_part2.d.ts.map
 
 //// [/home/src/workspaces/solution/second/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./second_part1.ts","./second_part2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","signature":"-12385043917-declare namespace N {\n}\ndeclare namespace N {\n}\n","affectsGlobalScope":true},{"version":"3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n","signature":"-4226833059-declare class C {\n    doSomething(): void;\n}\n","affectsGlobalScope":true}],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./second_part2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./second_part1.ts","./second_part2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-12195290447-namespace N {\n    // Comment text\n}\n\nnamespace N {\n    function f() {\n        console.log('testing');\n    }\n\n    f();\n}\n","signature":"-12385043917-declare namespace N {\n}\ndeclare namespace N {\n}\n","affectsGlobalScope":true},{"version":"3642692259-class C {\n    doSomething() {\n        console.log(\"something got done\");\n    }\n}\n","signature":"-4226833059-declare class C {\n    doSomething(): void;\n}\n","affectsGlobalScope":true}],"root":[2,3],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"latestChangedDtsFile":"./second_part2.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/second/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -423,23 +387,9 @@ declare class C {
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./second_part1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./second_part2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./second_part2.d.ts",
   "version": "FakeTSVersion",
-  "size": 1316
+  "size": 1279
 }
 
 //// [/home/src/workspaces/solution/third/third_part1.js.map]
@@ -458,7 +408,7 @@ declare var c: C;
 //# sourceMappingURL=third_part1.d.ts.map
 
 //// [/home/src/workspaces/solution/third/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../first/first_part1.d.ts","../first/first_part2.d.ts","../first/first_part3.d.ts","../second/second_part1.d.ts","../second/second_part2.d.ts","./third_part1.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14851202444-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\n","affectsGlobalScope":true},"-2054710634-//# sourceMappingURL=first_part2.d.ts.map",{"version":"-6420944280-declare function f(): string;\n","affectsGlobalScope":true},{"version":"-12385043917-declare namespace N {\n}\ndeclare namespace N {\n}\n","affectsGlobalScope":true},{"version":"-4226833059-declare class C {\n    doSomething(): void;\n}\n","affectsGlobalScope":true},{"version":"7305100057-var c = new C();\nc.doSomething();\n","signature":"1894672131-declare var c: C;\n","affectsGlobalScope":true}],"root":[7],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"latestChangedDtsFile":"./third_part1.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../first/first_part1.d.ts","../first/first_part2.d.ts","../first/first_part3.d.ts","../second/second_part1.d.ts","../second/second_part2.d.ts","./third_part1.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14851202444-interface TheFirst {\n    none: any;\n}\ndeclare const s = \"Hello, world\";\ninterface NoJsForHereEither {\n    none: any;\n}\n","affectsGlobalScope":true},"-2054710634-//# sourceMappingURL=first_part2.d.ts.map",{"version":"-6420944280-declare function f(): string;\n","affectsGlobalScope":true},{"version":"-12385043917-declare namespace N {\n}\ndeclare namespace N {\n}\n","affectsGlobalScope":true},{"version":"-4226833059-declare class C {\n    doSomething(): void;\n}\n","affectsGlobalScope":true},{"version":"7305100057-var c = new C();\nc.doSomething();\n","signature":"1894672131-declare var c: C;\n","affectsGlobalScope":true}],"root":[7],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":0,"removeComments":true,"skipDefaultLibCheck":true,"sourceMap":true,"strict":false,"target":1},"latestChangedDtsFile":"./third_part1.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/third/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -549,40 +499,10 @@ declare var c: C;
     "strict": false,
     "target": 1
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../first/first_part1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../first/first_part2.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../first/first_part3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../second/second_part1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../second/second_part2.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./third_part1.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./third_part1.d.ts",
   "version": "FakeTSVersion",
-  "size": 1626
+  "size": 1581
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/sample1/always-builds-under-with-force-option.js b/tests/baselines/reference/tsbuild/sample1/always-builds-under-with-force-option.js
index 58b5c86812eca..e2b1fe39c7d00 100644
--- a/tests/baselines/reference/tsbuild/sample1/always-builds-under-with-force-option.js
+++ b/tests/baselines/reference/tsbuild/sample1/always-builds-under-with-force-option.js
@@ -204,51 +204,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -327,46 +294,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/building-using-buildReferencedProject.js b/tests/baselines/reference/tsbuild/sample1/building-using-buildReferencedProject.js
index d84875afdca0e..21e153a54ea52 100644
--- a/tests/baselines/reference/tsbuild/sample1/building-using-buildReferencedProject.js
+++ b/tests/baselines/reference/tsbuild/sample1/building-using-buildReferencedProject.js
@@ -216,51 +216,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuild/sample1/building-using-getNextInvalidatedProject.js b/tests/baselines/reference/tsbuild/sample1/building-using-getNextInvalidatedProject.js
index dbcbe28fc9d53..836dc505ec8b6 100644
--- a/tests/baselines/reference/tsbuild/sample1/building-using-getNextInvalidatedProject.js
+++ b/tests/baselines/reference/tsbuild/sample1/building-using-getNextInvalidatedProject.js
@@ -208,51 +208,18 @@ Project Result:: {
   "result": 0
 }
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -336,46 +303,13 @@ Project Result:: {
 }
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-declarationDir-is-specified.js b/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-declarationDir-is-specified.js
index 876c64be4fb38..3ca7f2979c306 100644
--- a/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-declarationDir-is-specified.js
@@ -203,51 +203,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -326,46 +293,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-outDir-is-specified.js b/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-outDir-is-specified.js
index 0f4bc0dd27b57..501ffdd77378d 100644
--- a/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-outDir-is-specified.js
+++ b/tests/baselines/reference/tsbuild/sample1/builds-correctly-when-outDir-is-specified.js
@@ -203,51 +203,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/outDir/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/outDir/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -326,46 +293,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/builds-downstream-projects-even-if-upstream-projects-have-errors.js b/tests/baselines/reference/tsbuild/sample1/builds-downstream-projects-even-if-upstream-projects-have-errors.js
index 0ee2eb98e94cd..5d18d93aa9070 100644
--- a/tests/baselines/reference/tsbuild/sample1/builds-downstream-projects-even-if-upstream-projects-have-errors.js
+++ b/tests/baselines/reference/tsbuild/sample1/builds-downstream-projects-even-if-upstream-projects-have-errors.js
@@ -229,51 +229,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.muitply();
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -366,46 +333,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/builds-till-project-specified.js b/tests/baselines/reference/tsbuild/sample1/builds-till-project-specified.js
index fd87597866adc..9cfc165a6dca3 100644
--- a/tests/baselines/reference/tsbuild/sample1/builds-till-project-specified.js
+++ b/tests/baselines/reference/tsbuild/sample1/builds-till-project-specified.js
@@ -201,51 +201,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuild/sample1/can-detect-when-and-what-to-rebuild.js b/tests/baselines/reference/tsbuild/sample1/can-detect-when-and-what-to-rebuild.js
index d2fc5c9de290f..c652d1995c8f5 100644
--- a/tests/baselines/reference/tsbuild/sample1/can-detect-when-and-what-to-rebuild.js
+++ b/tests/baselines/reference/tsbuild/sample1/can-detect-when-and-what-to-rebuild.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/cleaning-project-in-not-build-order-doesnt-throw-error.js b/tests/baselines/reference/tsbuild/sample1/cleaning-project-in-not-build-order-doesnt-throw-error.js
index 2dd1003dc8723..9f8b62b80ae32 100644
--- a/tests/baselines/reference/tsbuild/sample1/cleaning-project-in-not-build-order-doesnt-throw-error.js
+++ b/tests/baselines/reference/tsbuild/sample1/cleaning-project-in-not-build-order-doesnt-throw-error.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/cleans-till-project-specified.js b/tests/baselines/reference/tsbuild/sample1/cleans-till-project-specified.js
index f69bb860b3f2e..a789e8272be83 100644
--- a/tests/baselines/reference/tsbuild/sample1/cleans-till-project-specified.js
+++ b/tests/baselines/reference/tsbuild/sample1/cleans-till-project-specified.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/does-not-rebuild-if-there-is-no-program-and-bundle-in-the-ts-build-info-event-if-version-doesnt-match-ts-version.js b/tests/baselines/reference/tsbuild/sample1/does-not-rebuild-if-there-is-no-program-and-bundle-in-the-ts-build-info-event-if-version-doesnt-match-ts-version.js
index 9eefefd186ae2..0c20b201e3ea6 100644
--- a/tests/baselines/reference/tsbuild/sample1/does-not-rebuild-if-there-is-no-program-and-bundle-in-the-ts-build-info-event-if-version-doesnt-match-ts-version.js
+++ b/tests/baselines/reference/tsbuild/sample1/does-not-rebuild-if-there-is-no-program-and-bundle-in-the-ts-build-info-event-if-version-doesnt-match-ts-version.js
@@ -131,51 +131,18 @@ export declare function multiply(a: number, b: number): number;
 {"version":"FakeTSVersion"}
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -190,46 +157,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/explainFiles.js b/tests/baselines/reference/tsbuild/sample1/explainFiles.js
index 8e5061e1c0fe6..b8aa225bc8882 100644
--- a/tests/baselines/reference/tsbuild/sample1/explainFiles.js
+++ b/tests/baselines/reference/tsbuild/sample1/explainFiles.js
@@ -253,51 +253,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -376,46 +343,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/indicates-that-it-would-skip-builds-during-a-dry-build.js b/tests/baselines/reference/tsbuild/sample1/indicates-that-it-would-skip-builds-during-a-dry-build.js
index 563d86cce1ea4..56711d9cd8a51 100644
--- a/tests/baselines/reference/tsbuild/sample1/indicates-that-it-would-skip-builds-during-a-dry-build.js
+++ b/tests/baselines/reference/tsbuild/sample1/indicates-that-it-would-skip-builds-during-a-dry-build.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js b/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js
index ecaa2bd8dfd8b..39a01d5efb257 100644
--- a/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js
+++ b/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js
@@ -198,51 +198,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -321,46 +288,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -461,51 +395,18 @@ export const m = mod;
 function foo() {}
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAI,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAI,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function foo() { }
 //# sourceMappingURL=index.js.map
@@ -592,51 +493,18 @@ export const m = mod;
 function foo() {}export class cNew {}
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAI,CAAC;AAAA;IAAA;IAAmB,CAAC;IAAD,WAAC;AAAD,CAAC,AAApB,IAAoB;AAAP,oBAAI"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAI,CAAC;AAAA;IAAA;IAAmB,CAAC;IAAD,WAAC;AAAD,CAAC,AAApB,IAAoB;AAAP,oBAAI"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cNew = exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function foo() { }
 var cNew = /** @class */ (function () {
diff --git a/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js b/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js
index ea715f2643b35..f6b01ac84729a 100644
--- a/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js
+++ b/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js
@@ -218,51 +218,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -341,46 +308,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/listFiles.js b/tests/baselines/reference/tsbuild/sample1/listFiles.js
index abb926380e328..64a95fa19a9a7 100644
--- a/tests/baselines/reference/tsbuild/sample1/listFiles.js
+++ b/tests/baselines/reference/tsbuild/sample1/listFiles.js
@@ -217,51 +217,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -340,46 +307,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js b/tests/baselines/reference/tsbuild/sample1/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js
index 3d085ab99643d..78129b49980bc 100644
--- a/tests/baselines/reference/tsbuild/sample1/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js
+++ b/tests/baselines/reference/tsbuild/sample1/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/rebuilds-from-start-if-force-option-is-set.js b/tests/baselines/reference/tsbuild/sample1/rebuilds-from-start-if-force-option-is-set.js
index 8fffd9fb4c770..052905b822b16 100644
--- a/tests/baselines/reference/tsbuild/sample1/rebuilds-from-start-if-force-option-is-set.js
+++ b/tests/baselines/reference/tsbuild/sample1/rebuilds-from-start-if-force-option-is-set.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/rebuilds-when-extended-config-file-changes.js b/tests/baselines/reference/tsbuild/sample1/rebuilds-when-extended-config-file-changes.js
index 2016268d7fe31..a52728ae21d04 100644
--- a/tests/baselines/reference/tsbuild/sample1/rebuilds-when-extended-config-file-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/rebuilds-when-extended-config-file-changes.js
@@ -228,51 +228,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -351,46 +318,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/removes-all-files-it-built.js b/tests/baselines/reference/tsbuild/sample1/removes-all-files-it-built.js
index 318ea2172848b..f66c4a08d5d8c 100644
--- a/tests/baselines/reference/tsbuild/sample1/removes-all-files-it-built.js
+++ b/tests/baselines/reference/tsbuild/sample1/removes-all-files-it-built.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing-with-force.js b/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing-with-force.js
index ed4edc21ede05..517c7471b0a71 100644
--- a/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing-with-force.js
+++ b/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing-with-force.js
@@ -224,51 +224,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -353,46 +320,13 @@ export declare const m: any;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing.js b/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing.js
index 9df64aa60bb1f..56738ba535d51 100644
--- a/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing.js
+++ b/tests/baselines/reference/tsbuild/sample1/reports-error-if-input-file-is-missing.js
@@ -224,51 +224,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -353,46 +320,13 @@ export declare const m: any;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/sample.js b/tests/baselines/reference/tsbuild/sample1/sample.js
index 0cf44515183df..066116153a39c 100644
--- a/tests/baselines/reference/tsbuild/sample1/sample.js
+++ b/tests/baselines/reference/tsbuild/sample1/sample.js
@@ -221,51 +221,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -344,46 +311,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -633,60 +567,26 @@ emittedFile:/user/username/projects/sample1/logic/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
->>>var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
->>>    if (k2 === undefined) k2 = k;
->>>    var desc = Object.getOwnPropertyDescriptor(m, k);
->>>    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
->>>      desc = { enumerable: true, get: function() { return m[k]; } };
->>>    }
->>>    Object.defineProperty(o, k2, desc);
->>>}) : (function(o, m, k, k2) {
->>>    if (k2 === undefined) k2 = k;
->>>    o[k2] = m[k];
->>>}));
->>>var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
->>>    Object.defineProperty(o, "default", { enumerable: true, value: v });
->>>}) : function(o, v) {
->>>    o["default"] = v;
->>>});
->>>var __importStar = (this && this.__importStar) || (function () {
->>>    var ownKeys = function(o) {
->>>        ownKeys = Object.getOwnPropertyNames || function (o) {
->>>            var ar = [];
->>>            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
->>>            return ar;
->>>        };
->>>        return ownKeys(o);
->>>    };
->>>    return function (mod) {
->>>        if (mod && mod.__esModule) return mod;
->>>        var result = {};
->>>        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
->>>        __setModuleDefault(result, mod);
->>>        return result;
->>>    };
->>>})();
 >>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>exports.m = void 0;
 >>>exports.getSecondsInDay = getSecondsInDay;
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                          ^^^^^->
 1 >import * as c from '../core/index';
   >
 2 >export function getSecondsInDay() {
   >    return c.multiply(10, 15);
   >}
-1 >Emitted(37, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(37, 43) Source(4, 2) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 43) Source(4, 2) + SourceIndex(0)
 ---
->>>var c = __importStar(require("../core/index"));
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
+>>>var c = require("../core/index");
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
 2 >import * as c from '../core/index';
-1->Emitted(38, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(38, 48) Source(1, 36) + SourceIndex(0)
+1 >Emitted(5, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(5, 34) Source(1, 36) + SourceIndex(0)
 ---
 >>>function getSecondsInDay() {
 1 >
@@ -697,9 +597,9 @@ sourceFile:index.ts
   >
 2 >export function 
 3 >         getSecondsInDay
-1 >Emitted(39, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(39, 10) Source(2, 17) + SourceIndex(0)
-3 >Emitted(39, 25) Source(2, 32) + SourceIndex(0)
+1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(2, 17) + SourceIndex(0)
+3 >Emitted(6, 25) Source(2, 32) + SourceIndex(0)
 ---
 >>>    return c.multiply(10, 15);
 1->^^^^
@@ -725,36 +625,36 @@ sourceFile:index.ts
 9 >                          15
 10>                            )
 11>                             ;
-1->Emitted(40, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(40, 12) Source(3, 12) + SourceIndex(0)
-3 >Emitted(40, 13) Source(3, 13) + SourceIndex(0)
-4 >Emitted(40, 14) Source(3, 14) + SourceIndex(0)
-5 >Emitted(40, 22) Source(3, 22) + SourceIndex(0)
-6 >Emitted(40, 23) Source(3, 23) + SourceIndex(0)
-7 >Emitted(40, 25) Source(3, 25) + SourceIndex(0)
-8 >Emitted(40, 27) Source(3, 27) + SourceIndex(0)
-9 >Emitted(40, 29) Source(3, 29) + SourceIndex(0)
-10>Emitted(40, 30) Source(3, 30) + SourceIndex(0)
-11>Emitted(40, 31) Source(3, 31) + SourceIndex(0)
+1->Emitted(7, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(7, 12) Source(3, 12) + SourceIndex(0)
+3 >Emitted(7, 13) Source(3, 13) + SourceIndex(0)
+4 >Emitted(7, 14) Source(3, 14) + SourceIndex(0)
+5 >Emitted(7, 22) Source(3, 22) + SourceIndex(0)
+6 >Emitted(7, 23) Source(3, 23) + SourceIndex(0)
+7 >Emitted(7, 25) Source(3, 25) + SourceIndex(0)
+8 >Emitted(7, 27) Source(3, 27) + SourceIndex(0)
+9 >Emitted(7, 29) Source(3, 29) + SourceIndex(0)
+10>Emitted(7, 30) Source(3, 30) + SourceIndex(0)
+11>Emitted(7, 31) Source(3, 31) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(41, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(41, 2) Source(4, 2) + SourceIndex(0)
+1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0)
 ---
->>>var mod = __importStar(require("../core/anotherModule"));
+>>>var mod = require("../core/anotherModule");
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >import * as mod from '../core/anotherModule';
-1->Emitted(42, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(42, 58) Source(5, 46) + SourceIndex(0)
+1->Emitted(9, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(9, 44) Source(5, 46) + SourceIndex(0)
 ---
 >>>exports.m = mod;
 1 >
@@ -771,12 +671,12 @@ sourceFile:index.ts
 4 >          = 
 5 >            mod
 6 >               ;
-1 >Emitted(43, 1) Source(6, 14) + SourceIndex(0)
-2 >Emitted(43, 9) Source(6, 14) + SourceIndex(0)
-3 >Emitted(43, 10) Source(6, 15) + SourceIndex(0)
-4 >Emitted(43, 13) Source(6, 18) + SourceIndex(0)
-5 >Emitted(43, 16) Source(6, 21) + SourceIndex(0)
-6 >Emitted(43, 17) Source(6, 22) + SourceIndex(0)
+1 >Emitted(10, 1) Source(6, 14) + SourceIndex(0)
+2 >Emitted(10, 9) Source(6, 14) + SourceIndex(0)
+3 >Emitted(10, 10) Source(6, 15) + SourceIndex(0)
+4 >Emitted(10, 13) Source(6, 18) + SourceIndex(0)
+5 >Emitted(10, 16) Source(6, 21) + SourceIndex(0)
+6 >Emitted(10, 17) Source(6, 22) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js b/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js
index 6b5f1e7e03683..ef79f2c80f8da 100644
--- a/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js
+++ b/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js
@@ -413,51 +413,18 @@ function multiply(a, b) { return a * b; }
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -536,46 +503,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js b/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js
index 263130100ecf5..c9177b9622ea2 100644
--- a/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js
+++ b/tests/baselines/reference/tsbuild/sample1/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js
@@ -416,51 +416,18 @@ function multiply(a, b) { return a * b; }
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -539,46 +506,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/when-declarationMap-changes.js b/tests/baselines/reference/tsbuild/sample1/when-declarationMap-changes.js
index 6f971e09e4f17..eaffaf66eae31 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-declarationMap-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-declarationMap-changes.js
@@ -221,51 +221,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -344,46 +311,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/when-esModuleInterop-option-changes.js b/tests/baselines/reference/tsbuild/sample1/when-esModuleInterop-option-changes.js
index 207acea404ca8..49ea6f5f0dfec 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-esModuleInterop-option-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-esModuleInterop-option-changes.js
@@ -114,14 +114,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
 
-tests/tsconfig.json:18:24 - error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-18     "esModuleInterop": false
-                          ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/sample1/core/anotherModule.js]
@@ -230,51 +222,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -369,7 +328,7 @@ export declare const m: typeof mod;
 
 
 //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","../core/anothermodule.d.ts","../logic/index.d.ts","./index.ts"],"fileIdsList":[[3],[2,3,4]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-7362568283-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n","-9234818176-export declare const World = \"hello\";\n","-9659407152-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n",{"version":"-11950676699-import * as c from '../core/index';\nimport * as logic from '../logic/index';\n\nc.leftPad(\"\", 10);\nlogic.getSecondsInDay();\n\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\n","signature":"2702201019-import * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n"}],"root":[5],"options":{"composite":true,"declaration":true,"esModuleInterop":false,"skipDefaultLibCheck":true},"referencedMap":[[4,1],[5,2]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","../core/anothermodule.d.ts","../logic/index.d.ts","./index.ts"],"fileIdsList":[[3],[2,3,4]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-7362568283-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n","-9234818176-export declare const World = \"hello\";\n","-9659407152-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n",{"version":"-11950676699-import * as c from '../core/index';\nimport * as logic from '../logic/index';\n\nc.leftPad(\"\", 10);\nlogic.getSecondsInDay();\n\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\n","signature":"2702201019-import * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n"}],"root":[5],"options":{"composite":true,"declaration":true,"esModuleInterop":false,"skipDefaultLibCheck":true},"referencedMap":[[4,1],[5,2]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -443,35 +402,13 @@ export declare const m: typeof mod;
       "../logic/index.d.ts"
     ]
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../core/index.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../core/anothermodule.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../logic/index.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./index.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1607
+  "size": 1566
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: incremental-declaration-changes
 
@@ -510,7 +447,7 @@ Output::
 
 [HH:MM:SS AM] Project 'logic/tsconfig.json' is up to date because newest input 'logic/index.ts' is older than output 'logic/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'tests/tsconfig.json' is out of date because buildinfo file 'tests/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tests/tsconfig.json' is out of date because output 'tests/tsconfig.tsbuildinfo' is older than input 'tests/tsconfig.json'
 
 [HH:MM:SS AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
 
diff --git a/tests/baselines/reference/tsbuild/sample1/when-input-file-text-does-not-change-but-its-modified-time-changes.js b/tests/baselines/reference/tsbuild/sample1/when-input-file-text-does-not-change-but-its-modified-time-changes.js
index 8495c21f157c6..80cde3beda75d 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-input-file-text-does-not-change-but-its-modified-time-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-input-file-text-does-not-change-but-its-modified-time-changes.js
@@ -221,51 +221,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -344,46 +311,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuild/sample1/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/when-logic-specifies-tsBuildInfoFile.js
index 58624ebfd1f67..ff1119baf769b 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-logic-specifies-tsBuildInfoFile.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-logic-specifies-tsBuildInfoFile.js
@@ -222,51 +222,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -346,46 +313,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -635,60 +569,26 @@ emittedFile:/user/username/projects/sample1/logic/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
->>>var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
->>>    if (k2 === undefined) k2 = k;
->>>    var desc = Object.getOwnPropertyDescriptor(m, k);
->>>    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
->>>      desc = { enumerable: true, get: function() { return m[k]; } };
->>>    }
->>>    Object.defineProperty(o, k2, desc);
->>>}) : (function(o, m, k, k2) {
->>>    if (k2 === undefined) k2 = k;
->>>    o[k2] = m[k];
->>>}));
->>>var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
->>>    Object.defineProperty(o, "default", { enumerable: true, value: v });
->>>}) : function(o, v) {
->>>    o["default"] = v;
->>>});
->>>var __importStar = (this && this.__importStar) || (function () {
->>>    var ownKeys = function(o) {
->>>        ownKeys = Object.getOwnPropertyNames || function (o) {
->>>            var ar = [];
->>>            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
->>>            return ar;
->>>        };
->>>        return ownKeys(o);
->>>    };
->>>    return function (mod) {
->>>        if (mod && mod.__esModule) return mod;
->>>        var result = {};
->>>        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
->>>        __setModuleDefault(result, mod);
->>>        return result;
->>>    };
->>>})();
 >>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>exports.m = void 0;
 >>>exports.getSecondsInDay = getSecondsInDay;
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                          ^^^^^->
 1 >import * as c from '../core/index';
   >
 2 >export function getSecondsInDay() {
   >    return c.multiply(10, 15);
   >}
-1 >Emitted(37, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(37, 43) Source(4, 2) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 43) Source(4, 2) + SourceIndex(0)
 ---
->>>var c = __importStar(require("../core/index"));
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
+>>>var c = require("../core/index");
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
 2 >import * as c from '../core/index';
-1->Emitted(38, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(38, 48) Source(1, 36) + SourceIndex(0)
+1 >Emitted(5, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(5, 34) Source(1, 36) + SourceIndex(0)
 ---
 >>>function getSecondsInDay() {
 1 >
@@ -699,9 +599,9 @@ sourceFile:index.ts
   >
 2 >export function 
 3 >         getSecondsInDay
-1 >Emitted(39, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(39, 10) Source(2, 17) + SourceIndex(0)
-3 >Emitted(39, 25) Source(2, 32) + SourceIndex(0)
+1 >Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(2, 17) + SourceIndex(0)
+3 >Emitted(6, 25) Source(2, 32) + SourceIndex(0)
 ---
 >>>    return c.multiply(10, 15);
 1->^^^^
@@ -727,36 +627,36 @@ sourceFile:index.ts
 9 >                          15
 10>                            )
 11>                             ;
-1->Emitted(40, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(40, 12) Source(3, 12) + SourceIndex(0)
-3 >Emitted(40, 13) Source(3, 13) + SourceIndex(0)
-4 >Emitted(40, 14) Source(3, 14) + SourceIndex(0)
-5 >Emitted(40, 22) Source(3, 22) + SourceIndex(0)
-6 >Emitted(40, 23) Source(3, 23) + SourceIndex(0)
-7 >Emitted(40, 25) Source(3, 25) + SourceIndex(0)
-8 >Emitted(40, 27) Source(3, 27) + SourceIndex(0)
-9 >Emitted(40, 29) Source(3, 29) + SourceIndex(0)
-10>Emitted(40, 30) Source(3, 30) + SourceIndex(0)
-11>Emitted(40, 31) Source(3, 31) + SourceIndex(0)
+1->Emitted(7, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(7, 12) Source(3, 12) + SourceIndex(0)
+3 >Emitted(7, 13) Source(3, 13) + SourceIndex(0)
+4 >Emitted(7, 14) Source(3, 14) + SourceIndex(0)
+5 >Emitted(7, 22) Source(3, 22) + SourceIndex(0)
+6 >Emitted(7, 23) Source(3, 23) + SourceIndex(0)
+7 >Emitted(7, 25) Source(3, 25) + SourceIndex(0)
+8 >Emitted(7, 27) Source(3, 27) + SourceIndex(0)
+9 >Emitted(7, 29) Source(3, 29) + SourceIndex(0)
+10>Emitted(7, 30) Source(3, 30) + SourceIndex(0)
+11>Emitted(7, 31) Source(3, 31) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(41, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(41, 2) Source(4, 2) + SourceIndex(0)
+1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0)
 ---
->>>var mod = __importStar(require("../core/anotherModule"));
+>>>var mod = require("../core/anotherModule");
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >import * as mod from '../core/anotherModule';
-1->Emitted(42, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(42, 58) Source(5, 46) + SourceIndex(0)
+1->Emitted(9, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(9, 44) Source(5, 46) + SourceIndex(0)
 ---
 >>>exports.m = mod;
 1 >
@@ -773,12 +673,12 @@ sourceFile:index.ts
 4 >          = 
 5 >            mod
 6 >               ;
-1 >Emitted(43, 1) Source(6, 14) + SourceIndex(0)
-2 >Emitted(43, 9) Source(6, 14) + SourceIndex(0)
-3 >Emitted(43, 10) Source(6, 15) + SourceIndex(0)
-4 >Emitted(43, 13) Source(6, 18) + SourceIndex(0)
-5 >Emitted(43, 16) Source(6, 21) + SourceIndex(0)
-6 >Emitted(43, 17) Source(6, 22) + SourceIndex(0)
+1 >Emitted(10, 1) Source(6, 14) + SourceIndex(0)
+2 >Emitted(10, 9) Source(6, 14) + SourceIndex(0)
+3 >Emitted(10, 10) Source(6, 15) + SourceIndex(0)
+4 >Emitted(10, 13) Source(6, 18) + SourceIndex(0)
+5 >Emitted(10, 16) Source(6, 21) + SourceIndex(0)
+6 >Emitted(10, 17) Source(6, 22) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
deleted file mode 100644
index a4c8e54197d92..0000000000000
--- a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
+++ /dev/null
@@ -1,76 +0,0 @@
-0:: incremental-declaration-changes
-*** Needs explanation
-TsBuild info text without affectedFilesPendingEmit:: /user/username/projects/sample1/core/tsconfig.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../../../../../home/src/tslibs/ts/lib/lib.d.ts": {
-      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-      "affectsGlobalScope": true
-    },
-    "./anothermodule.ts": {
-      "version": "-3090574810-export const World = \"hello\";"
-    },
-    "./index.ts": {
-      "version": "-15745098553-export const someString: string = \"HELLO WORLD\";\nexport function leftPad(s: string, n: number) { return s + n; }\nexport function multiply(a: number, b: number) { return a * b; }\n"
-    },
-    "./some_decl.d.ts": {
-      "version": "-7959511260-declare const dts: any;",
-      "affectsGlobalScope": true
-    }
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./anothermodule.ts",
-        "./index.ts",
-        "./some_decl.d.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "module": 2
-  },
-  "version": "FakeTSVersion"
-}
-IncrementalBuild:
-{
-  "fileInfos": {
-    "../../../../../home/src/tslibs/ts/lib/lib.d.ts": {
-      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-      "affectsGlobalScope": true
-    },
-    "./anothermodule.ts": {
-      "version": "-3090574810-export const World = \"hello\";"
-    },
-    "./index.ts": {
-      "version": "-15745098553-export const someString: string = \"HELLO WORLD\";\nexport function leftPad(s: string, n: number) { return s + n; }\nexport function multiply(a: number, b: number) { return a * b; }\n"
-    },
-    "./some_decl.d.ts": {
-      "version": "-7959511260-declare const dts: any;",
-      "affectsGlobalScope": true
-    }
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./anothermodule.ts",
-        "./index.ts",
-        "./some_decl.d.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "module": 2
-  },
-  "errors": true,
-  "version": "FakeTSVersion"
-}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
index 95dda68e24c81..c9005b2bbb9e7 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
@@ -204,14 +204,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-core/tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd"
-                ~~~~~
-
-
-Found 1 error.
-
 
 
 //// [/user/username/projects/sample1/core/anotherModule.js]
@@ -237,7 +229,7 @@ define(["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/sample1/core/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./anothermodule.ts","./index.ts","./some_decl.d.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-3090574810-export const World = \"hello\";","-15745098553-export const someString: string = \"HELLO WORLD\";\nexport function leftPad(s: string, n: number) { return s + n; }\nexport function multiply(a: number, b: number) { return a * b; }\n",{"version":"-7959511260-declare const dts: any;","affectsGlobalScope":true}],"root":[[2,4]],"options":{"module":2},"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./anothermodule.ts","./index.ts","./some_decl.d.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-3090574810-export const World = \"hello\";","-15745098553-export const someString: string = \"HELLO WORLD\";\nexport function leftPad(s: string, n: number) { return s + n; }\nexport function multiply(a: number, b: number) { return a * b; }\n",{"version":"-7959511260-declare const dts: any;","affectsGlobalScope":true}],"root":[[2,4]],"options":{"module":2},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/sample1/core/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -291,10 +283,9 @@ define(["require", "exports"], function (require, exports) {
   "options": {
     "module": 2
   },
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 969
+  "size": 955
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly-when-the-referenced-project-uses-different-module-resolution.js b/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly-when-the-referenced-project-uses-different-module-resolution.js
index 13842f3141c28..8964c0f93506c 100644
--- a/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly-when-the-referenced-project-uses-different-module-resolution.js
+++ b/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly-when-the-referenced-project-uses-different-module-resolution.js
@@ -85,11 +85,6 @@ declare const console: { log(msg: any): void; };
 Output::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.ts
-tsconfig.b.json:4:25 - error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "moduleResolution": "classic"
-                          ~~~~~~~~~
-
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.d.ts
 /user/username/projects/transitiveReferences/b.ts
@@ -105,7 +100,7 @@ Output::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Found 2 errors.
+Found 1 error.
 
 
 
@@ -182,7 +177,7 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-8728835846-export declare class A {\n}\n",{"version":"-17186364832-import {A} from 'a';\nexport const b = new A();","signature":"6078874460-import { A } from 'a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-8728835846-export declare class A {\n}\n",{"version":"-17186364832-import {A} from 'a';\nexport const b = new A();","signature":"6078874460-import { A } from 'a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -233,23 +228,9 @@ export declare const b: A;
       "./a.d.ts"
     ]
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./a.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./b.d.ts",
   "version": "FakeTSVersion",
-  "size": 912
+  "size": 875
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
diff --git a/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js b/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
index b619dce91dc8f..ea62a801505e8 100644
--- a/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
+++ b/tests/baselines/reference/tsbuildWatch/configFileErrors/outFile/reports-syntax-errors-in-config-file.js
@@ -40,17 +40,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5   "module": "amd"
-              ~~~~~
-
 tsconfig.json:10:9 - error TS1005: ',' expected.
 
 10         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -79,7 +74,7 @@ declare module "b" {
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4646078106-export function foo() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","4646078106-export function foo() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -108,24 +103,11 @@ declare module "b" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-5340070911-declare module \"a\" {\n    export function foo(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 922
+  "size": 899
 }
 
 
@@ -155,7 +137,10 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -192,17 +177,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6   "module": "amd"
-              ~~~~~
-
 tsconfig.json:11:9 - error TS1005: ',' expected.
 
 11         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -227,7 +207,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -252,17 +232,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6   "module": "amd"
-              ~~~~~
-
 tsconfig.json:11:9 - error TS1005: ',' expected.
 
 11         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -291,7 +266,7 @@ declare module "b" {
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3260843409-export function fooBar() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"771185302-declare module \"a\" {\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3260843409-export function fooBar() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"declaration":true,"module":2,"outFile":"./outFile.js"},"outSignature":"771185302-declare module \"a\" {\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -321,24 +296,11 @@ declare module "b" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "771185302-declare module \"a\" {\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 946
+  "size": 923
 }
 
 
@@ -362,7 +324,10 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -385,17 +350,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:6:13 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6   "module": "amd"
-              ~~~~~
-
 tsconfig.json:11:9 - error TS1005: ',' expected.
 
 11         "b.ts"
            ~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -420,7 +380,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -456,15 +416,47 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/outFile.tsbuildinfo]
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-3260843409-export function fooBar() { }","1045484683-export function bar() { }"],"root":[2,3],"options":{"composite":true,"declaration":true,"module":2,"outFile":"./outFile.js"},"outSignature":"771185302-declare module \"a\" {\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+
+//// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./myproject/a.ts",
+    "./myproject/b.ts"
+  ],
+  "fileInfos": {
+    "../../../home/src/tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./myproject/a.ts": "-3260843409-export function fooBar() { }",
+    "./myproject/b.ts": "1045484683-export function bar() { }"
+  },
+  "root": [
+    [
+      2,
+      "./myproject/a.ts"
+    ],
+    [
+      3,
+      "./myproject/b.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "outSignature": "771185302-declare module \"a\" {\n    export function fooBar(): void;\n}\ndeclare module \"b\" {\n    export function bar(): void;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
+  "version": "FakeTSVersion",
+  "size": 909
+}
+
 
 
 Program root files: [
@@ -486,7 +478,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js b/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
index 09303ad5cae87..1bd8941afe43e 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
@@ -92,12 +92,7 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/project2/tsconfig.json'...
 
-project2/tsconfig.json:7:25 - error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-7     "moduleResolution": "classic"
-                          ~~~~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -202,7 +197,7 @@ export {};
 
 
 //// [/user/username/projects/myproject/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./file.d.ts","./index.ts","../node_modules/@types/foo/index.d.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-12737086933-export const foo = 10;",{"version":"-4708082513-import { foo } from \"file\";","signature":"-3531856636-export {};\n"},{"version":"-12737086933-export const foo = 10;","impliedFormat":1}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./file.d.ts","./index.ts","../node_modules/@types/foo/index.d.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-12737086933-export const foo = 10;",{"version":"-4708082513-import { foo } from \"file\";","signature":"-3531856636-export {};\n"},{"version":"-12737086933-export const foo = 10;","impliedFormat":1}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -263,27 +258,9 @@ export {};
       "./file.d.ts"
     ]
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./file.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./index.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../node_modules/@types/foo/index.d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 972
+  "size": 933
 }
 
 
@@ -380,7 +357,11 @@ Program files::
 /user/username/projects/myproject/project2/index.ts
 /user/username/projects/myproject/node_modules/@types/foo/index.d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/project2/file.d.ts
+/user/username/projects/myproject/project2/index.ts
+/user/username/projects/myproject/node_modules/@types/foo/index.d.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -413,12 +394,7 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/project1/tsconfig.json'...
 
-project2/tsconfig.json:7:25 - error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-7     "moduleResolution": "classic"
-                          ~~~~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index bf543dca91868..f4717c0cc7229 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -44,17 +44,22 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -83,13 +88,35 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 1015
 }
 
 
@@ -125,7 +152,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -154,17 +184,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -193,13 +218,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 701
+  "size": 694
 }
 
 
@@ -224,7 +248,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -256,21 +283,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -299,22 +321,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 //// [/home/src/projects/outFile.js]
@@ -362,7 +370,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -395,16 +403,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -430,7 +433,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -455,21 +458,26 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -498,11 +506,35 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 712
+  "size": 1015
 }
 
 
@@ -527,7 +559,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -573,17 +608,12 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -612,20 +642,6 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -650,7 +666,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 //// [/home/src/projects/outFile.js]
@@ -694,7 +710,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -731,10 +747,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -762,7 +783,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index 1e1d7f21d4db6..3269edce1ae23 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -43,17 +43,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -81,13 +76,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 697
+  "size": 693
 }
 
 
@@ -122,7 +116,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -147,21 +144,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -189,13 +181,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -219,7 +210,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -250,21 +244,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,22 +281,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -345,7 +320,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -377,16 +352,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -411,7 +381,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -436,21 +406,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -478,8 +443,9 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 693
@@ -506,7 +472,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -537,21 +506,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -579,22 +543,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 710
+  "size": 673
 }
 
 //// [/home/src/projects/outFile.js]
@@ -637,7 +587,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -669,16 +619,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -703,7 +648,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index cf431ef204fb3..6913b2db27bbf 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -43,17 +43,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -81,13 +81,26 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 689
+  "size": 837
 }
 
 
@@ -122,7 +135,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -151,17 +167,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -189,13 +200,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -219,7 +229,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -250,21 +263,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,22 +300,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -345,7 +339,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -377,16 +371,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -411,7 +400,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -436,21 +425,21 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -478,11 +467,26 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 685
+  "size": 837
 }
 
 
@@ -506,7 +510,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -541,17 +548,17 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -580,21 +587,21 @@ Output::
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 702
+  "size": 817
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -618,7 +625,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -654,10 +661,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -684,7 +691,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index 0116597087301..88021bd1f0098 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -151,17 +151,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -189,13 +184,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -219,7 +213,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -250,21 +247,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that some of the changes were not emitted
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,22 +284,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -345,7 +323,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -377,16 +355,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'tsconfig.json'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -411,7 +384,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -436,7 +409,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../outFile.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../outFile.tsbuildinfo' is older than input 'a.ts'
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
index c97ebe2a69001..3e4f2f8fca3b2 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
@@ -61,12 +61,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -188,12 +183,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -253,17 +243,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -298,15 +283,41 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 938
+  "size": 904
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
@@ -358,47 +369,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
 exitCode:: ExitStatus.undefined
 
 Change:: semantic errors
@@ -421,7 +402,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
@@ -430,12 +411,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -557,12 +533,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -620,17 +591,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -665,15 +631,28 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 895
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 
 Program root files: [
@@ -725,46 +704,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
-
-
-
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
-No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
 
@@ -789,21 +738,26 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+2 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"emitDiagnosticsPerFile":[[3,[{"start":53,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":53,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -838,13 +792,35 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "emitDiagnosticsPerFile": [
+    [
+      "./noemitonerror/src/main.ts",
+      [
+        {
+          "start": 53,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 53,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
   "pendingEmit": [
-    "Js | Dts",
-    false
+    "Js | DtsEmit",
+    17
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 945
+  "size": 1234
 }
 
 
@@ -902,10 +878,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
+
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -966,17 +947,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -1011,15 +987,51 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 937
+  "size": 903
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
@@ -1071,45 +1083,15 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "declaration": true,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
index 0b2fa97983ea0..bb7ef9bd8d077 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -60,12 +60,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -156,12 +151,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -220,17 +210,55 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
@@ -281,19 +309,19 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
+//// [/user/username/projects/dev-build.d.ts] file changed its modified time
 
 
 Program root files: [
@@ -343,7 +371,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
@@ -352,17 +380,25 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"errors":true,"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 148
+}
+
 
 
 Program root files: [
@@ -422,12 +458,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -484,17 +515,42 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 
 Program root files: [
@@ -545,19 +601,19 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
+//// [/user/username/projects/dev-build.d.ts] file changed its modified time
 
 
 Program root files: [
@@ -608,21 +664,39 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+2 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"errors":true,"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 148
+}
+
 
 
 Program root files: [
@@ -677,10 +751,15 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+2 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -740,17 +819,65 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
@@ -801,19 +928,19 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
+//// [/user/username/projects/dev-build.d.ts] file changed its modified time
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
index d8b66df7dd8de..859dd8d2941ac 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -60,12 +60,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -185,12 +180,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -249,17 +239,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -293,15 +278,29 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 919
+  "size": 885
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -352,45 +351,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
-
-
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
 
@@ -414,7 +384,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
@@ -423,12 +393,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -548,12 +513,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -610,17 +570,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -654,15 +609,27 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 910
+  "size": 876
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -713,45 +680,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
-
-
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
 
@@ -776,21 +714,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -824,15 +757,33 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 926
+  "size": 892
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -883,46 +834,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
-
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
-
 exitCode:: ExitStatus.undefined
 
 Change:: Fix dts errors
@@ -946,21 +868,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -994,15 +911,11 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 918
+  "size": 884
 }
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 
 Program root files: [
@@ -1053,44 +966,15 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
-
-[HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[HH:MM:SS AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
-
-
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
 
-Program root files: [
-  "/user/username/projects/noEmitOnError/shared/types/db.ts",
-  "/user/username/projects/noEmitOnError/src/main.ts",
-  "/user/username/projects/noEmitOnError/src/other.ts"
-]
-Program options: {
-  "outFile": "/user/username/projects/dev-build.js",
-  "module": 2,
-  "incremental": true,
-  "noEmitOnError": true,
-  "watch": true,
-  "tscBuild": true,
-  "configFilePath": "/user/username/projects/noEmitOnError/tsconfig.json"
-}
-Program structureReused: Not
-Program files::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/noEmitOnError/shared/types/db.ts
-/user/username/projects/noEmitOnError/src/main.ts
-/user/username/projects/noEmitOnError/src/other.ts
-
-Semantic diagnostics in builder refreshed for::
-
-No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
index f9a370379ea4a..d44501d152689 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -59,12 +59,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -154,12 +149,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -217,17 +207,43 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -277,19 +293,18 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
 
 
 Program root files: [
@@ -338,7 +353,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
@@ -347,17 +362,25 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"errors":true,"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 148
+}
+
 
 
 Program root files: [
@@ -416,12 +439,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -477,17 +495,41 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
-//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo]
+{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
+{
+  "root": [
+    "./noemitonerror/shared/types/db.ts",
+    "./noemitonerror/src/main.ts",
+    "./noemitonerror/src/other.ts"
+  ],
+  "version": "FakeTSVersion",
+  "size": 134
+}
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -537,19 +579,18 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
 
 
 Program root files: [
@@ -599,21 +640,39 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -663,19 +722,18 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
 
 
 Program root files: [
@@ -725,21 +783,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 
 Program root files: [
@@ -789,19 +843,18 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+[HH:MM:SS AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+//// [/user/username/projects/dev-build.js] file changed its modified time
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js
index eee221d2644c3..f99a705c03bba 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -332,46 +299,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 8d48a4aaac49d..fd720a66ac703 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -226,51 +226,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -349,46 +316,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -641,51 +575,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,SAAS,MAAM,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,SAAS,MAAM,KAAK,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function someFn() { }
 //# sourceMappingURL=index.js.map
@@ -821,52 +722,19 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAID,wBAA4B;AAP5B,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,SAAgB,MAAM,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAID,wBAA4B;AAP5B,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,SAAgB,MAAM,KAAK,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
 exports.someFn = someFn;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function someFn() { }
 //# sourceMappingURL=index.js.map
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index ac1a3eeaf8708..be98bfb460411 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -332,46 +299,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -621,51 +555,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,IAAI,CAAC,GAAW,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,IAAI,CAAC,GAAW,EAAE,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 var y = 10;
 //# sourceMappingURL=index.js.map
@@ -1021,51 +922,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index b8d83d90855fa..2c18b5b06ed12 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -208,51 +208,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -331,46 +298,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -622,51 +556,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,IAAI,CAAC,GAAW,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,IAAI,CAAC,GAAW,EAAE,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 var y = 10;
 //# sourceMappingURL=index.js.map
@@ -1023,51 +924,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-stopBuildOnErrors-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-stopBuildOnErrors-is-passed-on-command-line.js
index 3e58bc9121216..2b485b7ef3414 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-stopBuildOnErrors-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-stopBuildOnErrors-is-passed-on-command-line.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -332,46 +299,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -621,51 +555,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,IAAI,CAAC,GAAW,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AAErB,IAAI,CAAC,GAAW,EAAE,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 var y = 10;
 //# sourceMappingURL=index.js.map
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js b/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js
index 825f67eb892de..6afd0a779e5a5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js
@@ -450,51 +450,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -573,46 +540,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js b/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js
index 2e4fd875e55b1..1ddb12cb378c0 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js
@@ -453,51 +453,18 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -576,46 +543,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js
index 7a13960533c62..9d647e5444a19 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index 2376acc386ebe..847e86eedad87 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -205,47 +205,14 @@ export declare function multiply(a: number, b: number): number;
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -257,46 +224,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -563,53 +497,20 @@ Output::
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
 //// [/user/username/projects/sample1/logic/index.d.ts] file written with same contents
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo]
 {"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../core/index.d.ts","../core/anothermodule.d.ts","./index.ts"],"fileIdsList":[[2,3]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-7362568283-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n","-9234818176-export declare const World = \"hello\";\n",{"version":"-9623801128-import * as c from '../core/index';\nexport function getSecondsInDay() {\n    return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\n","signature":"-9659407152-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n"}],"root":[4],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 98ff1f01c6678..db903381c248e 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -205,51 +205,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -328,46 +295,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 5481b019b1253..890b0077bd329 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -205,51 +205,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -328,46 +295,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index be4a86afd7d8a..0e8b04117247b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -205,51 +205,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -328,46 +295,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index a043a72e21994..51e27240bd7f3 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -332,46 +299,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index d2121f7477b3d..58ede97170e26 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -332,46 +299,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index 385d265e9e9cc..5282ec1de44bd 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -209,51 +209,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -332,46 +299,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
diff --git a/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set.js b/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set.js
index 3287485f769a9..94f118c9de213 100644
--- a/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set.js
+++ b/tests/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set.js
@@ -109,7 +109,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
@@ -120,7 +120,7 @@ default: undefined
 --allowJs
 Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
 type: boolean
-default: `false`, unless `checkJs` is set
+default: false
 
 --checkJs
 Enable error reporting in type-checked JavaScript files.
@@ -154,7 +154,7 @@ Specify type package names to be included without being referenced in a source f
 --esModuleInterop
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
 type: boolean
-default: true
+default: false
 
 You can learn about all of the compiler options at https://aka.ms/tsc
 
diff --git a/tests/baselines/reference/tsc/commandLine/help-all.js b/tests/baselines/reference/tsc/commandLine/help-all.js
index e9b06fca35128..11e16a0603137 100644
--- a/tests/baselines/reference/tsc/commandLine/help-all.js
+++ b/tests/baselines/reference/tsc/commandLine/help-all.js
@@ -81,13 +81,13 @@ Conditions to set in addition to the resolver-specific defaults when resolving i
 
 --module, -m
 Specify what module code is generated.
-one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --moduleResolution
 Specify how TypeScript looks up a file from a given module specifier.
-one of: node16, nodenext, bundler
-default: `nodenext` if `module` is `nodenext`; `node16` if `module` is `node16` or `node18`; otherwise, `bundler`.
+one of: classic, node10, node16, nodenext, bundler
+default: module === `AMD` or `UMD` or `System` or `ES6`, then `Classic`, Otherwise `Node`
 
 --moduleSuffixes
 List of file name suffixes to search when resolving a module.
@@ -147,7 +147,7 @@ Specify type package names to be included without being referenced in a source f
 --allowJs
 Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
 type: boolean
-default: `false`, unless `checkJs` is set
+default: false
 
 --checkJs
 Enable error reporting in type-checked JavaScript files.
@@ -164,7 +164,7 @@ default: 0
 --allowSyntheticDefaultImports
 Allow 'import x from y' when a module doesn't have a default export.
 type: boolean
-default: true
+default: module === "system" or esModuleInterop
 
 --erasableSyntaxOnly
 Do not allow runtime constructs that are not part of ECMAScript.
@@ -174,7 +174,7 @@ default: false
 --esModuleInterop
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
 type: boolean
-default: true
+default: false
 
 --forceConsistentCasingInFileNames
 Ensure that casing is correct in imports.
diff --git a/tests/baselines/reference/tsc/commandLine/help.js b/tests/baselines/reference/tsc/commandLine/help.js
index 5d813efbed7df..ceeacaed38e66 100644
--- a/tests/baselines/reference/tsc/commandLine/help.js
+++ b/tests/baselines/reference/tsc/commandLine/help.js
@@ -108,7 +108,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
@@ -119,7 +119,7 @@ default: undefined
 --allowJs
 Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
 type: boolean
-default: `false`, unless `checkJs` is set
+default: false
 
 --checkJs
 Enable error reporting in type-checked JavaScript files.
@@ -153,7 +153,7 @@ Specify type package names to be included without being referenced in a source f
 --esModuleInterop
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
 type: boolean
-default: true
+default: false
 
 You can learn about all of the compiler options at https://aka.ms/tsc
 
diff --git a/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js b/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js
index 2d4298e0c357f..9dc2e08154928 100644
--- a/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js
+++ b/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js
@@ -109,7 +109,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
@@ -120,7 +120,7 @@ default: undefined
 --allowJs
 Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
 type: boolean
-default: `false`, unless `checkJs` is set
+default: false
 
 --checkJs
 Enable error reporting in type-checked JavaScript files.
@@ -154,7 +154,7 @@ Specify type package names to be included without being referenced in a source f
 --esModuleInterop
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
 type: boolean
-default: true
+default: false
 
 You can learn about all of the compiler options at https://aka.ms/tsc
 
diff --git a/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js b/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js
index 2d4298e0c357f..9dc2e08154928 100644
--- a/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js
+++ b/tests/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js
@@ -109,7 +109,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
@@ -120,7 +120,7 @@ default: undefined
 --allowJs
 Allow JavaScript files to be a part of your program. Use the 'checkJs' option to get errors from these files.
 type: boolean
-default: `false`, unless `checkJs` is set
+default: false
 
 --checkJs
 Enable error reporting in type-checked JavaScript files.
@@ -154,7 +154,7 @@ Specify type package names to be included without being referenced in a source f
 --esModuleInterop
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
 type: boolean
-default: true
+default: false
 
 You can learn about all of the compiler options at https://aka.ms/tsc
 
diff --git a/tests/baselines/reference/tsc/composite/converting-to-modules.js b/tests/baselines/reference/tsc/composite/converting-to-modules.js
index 18f4cdc9795fc..37ccbece2b760 100644
--- a/tests/baselines/reference/tsc/composite/converting-to-modules.js
+++ b/tests/baselines/reference/tsc/composite/converting-to-modules.js
@@ -28,14 +28,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-
-Found 1 error in tsconfig.json:3
-
 
 
 //// [/home/src/workspaces/project/src/main.js]
@@ -47,7 +39,7 @@ declare const x = 10;
 
 
 //// [/home/src/workspaces/project/tsconfig.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./src/main.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"5029505981-const x = 10;","signature":"-4001438729-declare const x = 10;\n","affectsGlobalScope":true}],"root":[2],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2],"latestChangedDtsFile":"./src/main.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./src/main.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"5029505981-const x = 10;","signature":"-4001438729-declare const x = 10;\n","affectsGlobalScope":true}],"root":[2],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./src/main.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -86,23 +78,13 @@ declare const x = 10;
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/main.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./src/main.d.ts",
   "version": "FakeTSVersion",
-  "size": 783
+  "size": 748
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: convert to modules
 
diff --git a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
index bc60471054c50..dde78ed6bd950 100644
--- a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors-with-incremental.js
@@ -50,11 +50,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -64,28 +59,21 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 1 error in src/index.ts:2
 
-Errors  Files
-     1  src/index.ts:2
-     1  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define("src/index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
-    ky_1 = __importDefault(ky_1);
     exports.api = ky_1.default.extend({});
 });
 
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo]
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","10101889135-type KyInstance = {\n    extend(options: Record<string,unknown>): KyInstance;\n}\ndeclare const ky: KyInstance;\nexport default ky;\n","-383421929-import ky from 'ky';\nexport const api = ky.extend({});\n"],"root":[3],"options":{"composite":true,"module":2,"outFile":"./outFile.js","skipDefaultLibCheck":true,"skipLibCheck":true},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[3,[{"start":34,"length":3,"messageText":"Exported variable 'api' has or is using name 'KyInstance' from external module \"/home/src/workspaces/project/ky\" but cannot be named.","category":1,"code":4023}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","10101889135-type KyInstance = {\n    extend(options: Record<string,unknown>): KyInstance;\n}\ndeclare const ky: KyInstance;\nexport default ky;\n","-383421929-import ky from 'ky';\nexport const api = ky.extend({});\n"],"root":[3],"options":{"composite":true,"module":2,"outFile":"./outFile.js","skipDefaultLibCheck":true,"skipLibCheck":true},"emitDiagnosticsPerFile":[[3,[{"start":34,"length":3,"messageText":"Exported variable 'api' has or is using name 'KyInstance' from external module \"/home/src/workspaces/project/ky\" but cannot be named.","category":1,"code":4023}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -112,20 +100,6 @@ define("src/index", ["require", "exports", "ky"], function (require, exports, ky
     "skipDefaultLibCheck": true,
     "skipLibCheck": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./ky.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./src/index.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./src/index.ts",
@@ -141,7 +115,7 @@ define("src/index", ["require", "exports", "ky"], function (require, exports, ky
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1129
+  "size": 1092
 }
 
 
@@ -158,11 +132,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 ky.d.ts
@@ -170,11 +139,8 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 1 error in src/index.ts:2
 
-Errors  Files
-     1  src/index.ts:2
-     1  tsconfig.json:3
 
 
 
@@ -198,11 +164,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 ky.d.ts
@@ -210,7 +171,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors.
+Found 1 error.
 
 
 
diff --git a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js
index c09c0c85bc8de..13988d1360687 100644
--- a/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js
+++ b/tests/baselines/reference/tsc/declarationEmit/outFile/reports-dts-generation-errors.js
@@ -49,11 +49,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -62,22 +57,15 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 1 error in src/index.ts:2
 
-Errors  Files
-     1  src/index.ts:2
-     1  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define("index", ["require", "exports", "ky"], function (require, exports, ky_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.api = void 0;
-    ky_1 = __importDefault(ky_1);
     exports.api = ky_1.default.extend({});
 });
 
@@ -96,11 +84,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -109,11 +92,8 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 2 errors in 2 files.
+Found 1 error in src/index.ts:2
 
-Errors  Files
-     1  src/index.ts:2
-     1  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js] file written with same contents
@@ -138,11 +118,6 @@ Output::
 2 export const api = ky.extend({});
                ~~~
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 TSFILE: /home/src/workspaces/project/outFile.js
 TSFILE: /home/src/workspaces/project/outFile.tsbuildinfo
 ../../tslibs/TS/Lib/lib.d.ts
@@ -154,7 +129,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
diff --git a/tests/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js b/tests/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js
index 3b7a57a26b421..87e47b53bbe2c 100644
--- a/tests/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js
+++ b/tests/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js
@@ -61,13 +61,10 @@ export default _default;
 
 //// [/home/src/workspaces/project/reexport.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstantNumber = void 0;
 var constants_1 = require("./constants");
-Object.defineProperty(exports, "ConstantNumber", { enumerable: true, get: function () { return __importDefault(constants_1).default; } });
+Object.defineProperty(exports, "ConstantNumber", { enumerable: true, get: function () { return constants_1.default; } });
 
 
 //// [/home/src/workspaces/project/reexport.d.ts]
diff --git a/tests/baselines/reference/tsc/incremental/generates-typerefs-correctly.js b/tests/baselines/reference/tsc/incremental/generates-typerefs-correctly.js
index e94ee39f798c2..913065ce181cf 100644
--- a/tests/baselines/reference/tsc/incremental/generates-typerefs-correctly.js
+++ b/tests/baselines/reference/tsc/incremental/generates-typerefs-correctly.js
@@ -90,43 +90,10 @@ export type Wrap<C> = {
 
 //// [/home/src/workspaces/project/outDir/src/bug.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bug = void 0;
-var B = __importStar(require("./box.js"));
-var W = __importStar(require("./wrap.js"));
+var B = require("./box.js");
+var W = require("./wrap.js");
 /**
  * @template {object} C
  * @param {C} source
@@ -268,43 +235,10 @@ Output::
 
 //// [/home/src/workspaces/project/outDir/src/bug.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.something = exports.bug = void 0;
-var B = __importStar(require("./box.js"));
-var W = __importStar(require("./wrap.js"));
+var B = require("./box.js");
+var W = require("./wrap.js");
 /**
  * @template {object} C
  * @param {C} source
diff --git a/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js b/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js
index c2498be43deb2..c75fe52c24818 100644
--- a/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js
+++ b/tests/baselines/reference/tsc/incremental/outFile/different-options-with-incremental.js
@@ -38,14 +38,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -78,7 +70,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -114,30 +106,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 883
+  "size": 842
 }
 
 
@@ -161,11 +131,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -173,14 +148,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -213,7 +180,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -250,30 +217,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 900
+  "size": 859
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -301,11 +246,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -313,14 +258,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -353,7 +290,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -389,30 +326,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 883
+  "size": 842
 }
 
 
@@ -436,11 +351,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration, emit Dts and should not emit js
 
@@ -448,18 +363,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -496,30 +403,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 902
+  "size": 861
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -559,11 +444,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -571,18 +456,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -620,30 +497,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 924
+  "size": 883
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -687,11 +542,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -699,14 +554,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -730,11 +577,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: local change
 
@@ -745,14 +592,6 @@ export const a = 10;const aLocal = 100;
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -785,7 +624,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -821,30 +660,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 884
+  "size": 843
 }
 
 
@@ -868,11 +685,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -880,18 +702,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -929,30 +743,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 925
+  "size": 884
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -980,11 +772,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -992,14 +784,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -1023,11 +807,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with inlineSourceMap
 
@@ -1035,14 +819,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --inlineSourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1075,7 +851,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1112,30 +888,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 907
+  "size": 866
 }
 
 
@@ -1160,11 +914,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -1172,14 +926,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1212,7 +958,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js","sourceMap":true},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1249,30 +995,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 901
+  "size": 860
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1300,11 +1024,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: emit js files
 
@@ -1312,14 +1036,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1352,7 +1068,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1388,30 +1104,8 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 884
+  "size": 843
 }
 
 
@@ -1435,11 +1129,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -1447,18 +1141,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1496,30 +1182,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 925
+  "size": 884
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1547,11 +1211,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap, should not re-emit
 
@@ -1559,14 +1223,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -1592,8 +1248,8 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/incremental/outFile/different-options.js b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
index f99fe7b6c4423..b92749717b3b3 100644
--- a/tests/baselines/reference/tsc/incremental/outFile/different-options.js
+++ b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
@@ -38,14 +38,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -93,7 +85,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -130,32 +122,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1183
+  "size": 1142
 }
 
 
@@ -179,11 +149,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -191,14 +166,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -231,7 +198,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -269,32 +236,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1200
+  "size": 1159
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -322,11 +267,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -334,14 +279,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -374,7 +311,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -411,32 +348,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1183
+  "size": 1142
 }
 
 
@@ -460,11 +375,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration should not emit anything
 
@@ -472,14 +387,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -504,11 +411,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -516,14 +423,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -547,11 +446,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration and declarationMap
 
@@ -559,14 +458,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration --declarationMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -585,7 +476,7 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -624,32 +515,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1224
+  "size": 1183
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map]
@@ -678,11 +547,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: should re-emit only dts so they dont contain sourcemap
 
@@ -690,14 +559,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -716,7 +577,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-18487752940-export const a = 10;const aLocal = 10;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -753,32 +614,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1183
+  "size": 1142
 }
 
 
@@ -802,11 +641,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with emitDeclarationOnly should not emit anything
 
@@ -814,14 +653,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --emitDeclarationOnly
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -846,11 +677,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -858,14 +689,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -889,11 +712,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: local change
 
@@ -904,14 +727,6 @@ export const a = 10;const aLocal = 100;
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -944,7 +759,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -981,32 +796,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1184
+  "size": 1143
 }
 
 
@@ -1030,11 +823,16 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
+/home/src/workspaces/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with declaration should not emit anything
 
@@ -1042,14 +840,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --declaration
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -1074,11 +864,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with inlineSourceMap
 
@@ -1086,14 +876,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --inlineSourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1126,7 +908,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsSUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"inlineSourceMap":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1164,32 +946,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1207
+  "size": 1166
 }
 
 
@@ -1214,11 +974,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap
 
@@ -1226,14 +986,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1266,7 +1018,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1304,32 +1056,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1201
+  "size": 1160
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1357,11 +1087,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: declarationMap enabling
 
@@ -1379,14 +1109,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1434,7 +1156,7 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1472,32 +1194,10 @@ declare module "d" {
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1206
+  "size": 1165
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map] file written with same contents
@@ -1523,11 +1223,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: with sourceMap should not emit d.ts
 
@@ -1535,14 +1235,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --sourceMap
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1575,7 +1267,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-17390360476-export const a = 10;const aLocal = 100;","-6189287562-export const b = 10;const bLocal = 10;","3248317647-import { a } from \"./a\";export const c = a;","-19615769517-import { b } from \"./b\";export const d = b;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./outFile.js","sourceMap":true},"outSignature":"-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1614,32 +1306,10 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     "outFile": "./outFile.js",
     "sourceMap": true
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-25657667359-declare module \"a\" {\n    export const a = 10;\n}\ndeclare module \"b\" {\n    export const b = 10;\n}\ndeclare module \"c\" {\n    export const c = 10;\n}\ndeclare module \"d\" {\n    export const d = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1223
+  "size": 1182
 }
 
 //// [/home/src/workspaces/outFile.js.map] file written with same contents
@@ -1666,8 +1336,8 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js b/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js
index bb476183eccd6..acc9e7d064779 100644
--- a/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js
+++ b/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js
@@ -1,4 +1,63 @@
 0:: Add class3 to project1 and build it
 Ts buildinfo will not be updated in incremental build so it will have semantic diagnostics cached from previous build
 But in clean build because of global diagnostics, semantic diagnostics are not queried so not cached in tsbuildinfo
-*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../../../tslibs/ts/lib/lib.d.ts": {
+      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "affectsGlobalScope": true
+    },
+    "../project1/class1.d.ts": {
+      "version": "-3469237238-declare class class1 {}",
+      "affectsGlobalScope": true
+    },
+    "./class2.ts": {
+      "version": "777969115-class class2 {}",
+      "affectsGlobalScope": true
+    }
+  },
+  "root": [
+    [
+      3,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 0
+  },
+  "latestChangedDtsFile": "FakeFileName",
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../../../tslibs/ts/lib/lib.d.ts": {
+      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "affectsGlobalScope": true
+    },
+    "../project1/class1.d.ts": {
+      "version": "-3469237238-declare class class1 {}",
+      "affectsGlobalScope": true
+    },
+    "./class2.ts": {
+      "version": "777969115-class class2 {}",
+      "affectsGlobalScope": true
+    }
+  },
+  "root": [
+    [
+      3,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 0
+  },
+  "latestChangedDtsFile": "FakeFileName",
+  "errors": true,
+  "version": "FakeTSVersion"
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project.js
index 9323244cc7a7e..b5abc3a8f45e9 100644
--- a/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project.js
@@ -50,14 +50,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -i -p project2
 Output::
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-
-Found 1 error in project2/tsconfig.json:3
-
 
 
 //// [/home/src/workspaces/projects/project2/class2.js]
@@ -74,7 +66,7 @@ declare class class2 {
 
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -123,27 +115,13 @@ declare class class2 {
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 891
+  "size": 854
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add class3 to project1 and build it
 
@@ -167,16 +145,67 @@ Output::
       ~~~~~
     File is output from referenced project specified here.
 
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
 
-Found 2 errors in the same file, starting at: project2/tsconfig.json:3
+Found 1 error.
 
 
 
+//// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","errors":true,"version":"FakeTSVersion"}
+
+//// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "../project1/class1.d.ts",
+    "./class2.ts"
+  ],
+  "fileInfos": {
+    "../../../tslibs/ts/lib/lib.d.ts": {
+      "original": {
+        "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "affectsGlobalScope": true
+      },
+      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "signature": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "affectsGlobalScope": true
+    },
+    "../project1/class1.d.ts": {
+      "original": {
+        "version": "-3469237238-declare class class1 {}",
+        "affectsGlobalScope": true
+      },
+      "version": "-3469237238-declare class class1 {}",
+      "signature": "-3469237238-declare class class1 {}",
+      "affectsGlobalScope": true
+    },
+    "./class2.ts": {
+      "original": {
+        "version": "777969115-class class2 {}",
+        "signature": "-2684084705-declare class class2 {\n}\n",
+        "affectsGlobalScope": true
+      },
+      "version": "777969115-class class2 {}",
+      "signature": "-2684084705-declare class class2 {\n}\n",
+      "affectsGlobalScope": true
+    }
+  },
+  "root": [
+    [
+      3,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 0
+  },
+  "latestChangedDtsFile": "./class2.d.ts",
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 868
+}
+
 
 exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
@@ -189,19 +218,11 @@ declare class class3 {}
 
 /home/src/tslibs/TS/Lib/tsc.js -i -p project2
 Output::
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-
-Found 1 error in project2/tsconfig.json:3
-
 
 
 //// [/home/src/workspaces/projects/project2/class2.js] file written with same contents
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -260,31 +281,13 @@ Found 1 error in project2/tsconfig.json:3
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 995
+  "size": 956
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add excluded file to project1
 
@@ -295,18 +298,10 @@ declare class file {}
 
 /home/src/tslibs/TS/Lib/tsc.js -i -p project2
 Output::
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-
-Found 1 error in project2/tsconfig.json:3
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Delete output for class3
 
@@ -328,19 +323,14 @@ Output::
       ~~~~~
     File is output from referenced project specified here.
 
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
 
-
-Found 2 errors in the same file, starting at: project2/tsconfig.json:3
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/projects/project2/class2.js] file written with same contents
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -390,10 +380,6 @@ Found 2 errors in the same file, starting at: project2/tsconfig.json:3
     "module": 0
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "../project1/class1.d.ts",
       "not cached or not changed"
@@ -405,7 +391,7 @@ Found 2 errors in the same file, starting at: project2/tsconfig.json:3
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 891
+  "size": 889
 }
 
 
@@ -420,19 +406,11 @@ declare class class3 {}
 
 /home/src/tslibs/TS/Lib/tsc.js -i -p project2
 Output::
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-
-Found 1 error in project2/tsconfig.json:3
-
 
 
 //// [/home/src/workspaces/projects/project2/class2.js] file written with same contents
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -491,28 +469,10 @@ Found 1 error in project2/tsconfig.json:3
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 995
+  "size": 956
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js
index db54e7badaee7..60546efaaf56e 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js
@@ -1,8 +1,114 @@
 5:: no-change-run
 Clean build will have check pending since it didnt type check
 Incremental build has typechecked before this so wont have checkPending
-*** Supplied discrepancy explanation but didnt find any difference
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "checkPending": true,
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
 15:: no-change-run
 Clean build will have check pending since it didnt type check
 Incremental build has typechecked before this so wont have checkPending
-*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;",
+    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
+  },
+  "root": [
+    [
+      [
+        2,
+        4
+      ],
+      [
+        "./project/a.ts",
+        "./project/b.ts",
+        "./project/c.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "checkPending": true,
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;",
+    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
+  },
+  "root": [
+    [
+      [
+        2,
+        4
+      ],
+      [
+        "./project/a.ts",
+        "./project/b.ts",
+        "./project/c.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js
index 9cf2e8be15a3a..951db916f250e 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental.js
@@ -43,17 +43,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-5     "module": "amd",
-                ~~~~~
+Found 1 error in a.ts:1
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -189,17 +181,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:5
 
 
 
@@ -236,14 +220,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -342,7 +318,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -350,14 +326,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -383,7 +351,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -391,18 +359,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -431,22 +391,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -467,11 +413,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -479,14 +428,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -507,11 +448,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -519,65 +460,8 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"checkPending":true,"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "checkPending": true,
-  "version": "FakeTSVersion",
-  "size": 734
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -597,11 +481,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error with noCheck
 
@@ -622,17 +506,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -768,17 +644,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors in 2 files.
+Found 1 error in a.ts:1
 
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:5
 
 
 
@@ -822,21 +690,13 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors in 2 files.
+Found 1 error in a.ts:1
 
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -865,20 +725,6 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -903,7 +749,7 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 
@@ -924,7 +770,10 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
@@ -939,14 +788,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1037,7 +878,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1045,18 +886,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1085,22 +918,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -1121,11 +940,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -1136,13 +958,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
@@ -1168,7 +990,7 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1203,25 +1025,21 @@ define("c", ["require", "exports"], function (require, exports) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -1256,7 +1074,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1281,17 +1103,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-5     "module": "amd",
-                ~~~~~
+Found 1 error in a.ts:1
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1437,14 +1251,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1552,7 +1358,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1560,18 +1366,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1606,25 +1412,21 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1647,7 +1449,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1659,74 +1465,8 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"checkPending":true,"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;",
-    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./project/a.ts",
-        "./project/b.ts",
-        "./project/c.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "checkPending": true,
-  "version": "FakeTSVersion",
-  "size": 805
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -1748,11 +1488,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1760,73 +1500,16 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;",
-    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./project/a.ts",
-        "./project/b.ts",
-        "./project/c.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "version": "FakeTSVersion",
-  "size": 785
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -1847,7 +1530,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
index b36f651a0c5d9..9ea6bbba7048e 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
@@ -42,17 +42,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in a.ts:1
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -111,17 +103,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors in 2 files.
+Found 1 error in a.ts:1
 
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -154,14 +138,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -206,7 +182,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -214,14 +190,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -244,7 +212,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -252,14 +220,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -281,7 +241,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -289,14 +249,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -318,7 +270,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -326,14 +278,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -356,7 +300,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error with noCheck
 
@@ -377,17 +321,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -446,17 +382,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -496,17 +424,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -538,14 +458,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -582,7 +494,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -590,14 +502,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -619,7 +523,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -630,13 +534,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
@@ -713,17 +617,9 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -783,14 +679,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -835,7 +723,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -843,13 +731,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
@@ -882,14 +770,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -914,7 +794,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -922,13 +802,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js
index db54e7badaee7..60546efaaf56e 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js
@@ -1,8 +1,114 @@
 5:: no-change-run
 Clean build will have check pending since it didnt type check
 Incremental build has typechecked before this so wont have checkPending
-*** Supplied discrepancy explanation but didnt find any difference
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "checkPending": true,
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
 15:: no-change-run
 Clean build will have check pending since it didnt type check
 Incremental build has typechecked before this so wont have checkPending
-*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;",
+    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
+  },
+  "root": [
+    [
+      [
+        2,
+        4
+      ],
+      [
+        "./project/a.ts",
+        "./project/b.ts",
+        "./project/c.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "checkPending": true,
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;",
+    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
+  },
+  "root": [
+    [
+      [
+        2,
+        4
+      ],
+      [
+        "./project/a.ts",
+        "./project/b.ts",
+        "./project/c.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js
index 330d3db3625c2..86ce4e7c02ce6 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental.js
@@ -33,14 +33,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -139,7 +131,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -147,14 +139,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -180,7 +164,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Fix `a` error with noCheck
 
@@ -191,14 +175,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -283,7 +259,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -291,14 +267,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -324,7 +292,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -332,18 +300,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -372,22 +332,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -408,11 +354,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -420,14 +369,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -448,11 +389,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -460,64 +401,7 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
-
-
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"checkPending":true,"version":"FakeTSVersion"}
 
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "checkPending": true,
-  "version": "FakeTSVersion",
-  "size": 734
-}
 
 
 Program root files: [
@@ -538,11 +422,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error with noCheck
 
@@ -553,14 +437,6 @@ export const a: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -645,7 +521,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -653,14 +529,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -686,7 +554,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -694,18 +562,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in a.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11705693502-export const a: number = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11705693502-export const a: number = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -735,21 +603,21 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 722
+  "size": 837
 }
 
 
@@ -770,7 +638,10 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
@@ -785,14 +656,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -877,7 +740,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -885,18 +748,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -925,22 +780,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -961,11 +802,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -976,13 +820,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
@@ -1020,7 +864,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1055,25 +899,21 @@ declare module "c" {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1096,7 +936,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1111,14 +955,6 @@ export const a: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -1217,7 +1053,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Fix `a` error with noCheck
 
@@ -1228,14 +1064,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -1334,7 +1162,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1342,18 +1170,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1388,25 +1216,21 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1429,7 +1253,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1441,74 +1269,8 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"checkPending":true,"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;",
-    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./project/a.ts",
-        "./project/b.ts",
-        "./project/c.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "checkPending": true,
-  "version": "FakeTSVersion",
-  "size": 805
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -1530,11 +1292,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1542,73 +1304,16 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;",
-    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./project/a.ts",
-        "./project/b.ts",
-        "./project/c.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "version": "FakeTSVersion",
-  "size": 785
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -1629,7 +1334,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
index 3d2ea9b5f3199..8011fe62e744c 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
@@ -32,14 +32,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -84,7 +76,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -92,14 +84,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -122,7 +106,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Fix `a` error with noCheck
 
@@ -133,14 +117,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -171,7 +147,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -179,14 +155,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -209,7 +177,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -217,14 +185,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -246,7 +206,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -254,14 +214,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -283,7 +235,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -291,14 +243,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -321,7 +265,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error with noCheck
 
@@ -332,14 +276,6 @@ export const a: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -370,7 +306,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -378,14 +314,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -408,7 +336,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -416,13 +344,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
@@ -456,14 +384,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -494,7 +414,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -502,14 +422,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -531,7 +443,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -542,13 +454,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
@@ -615,14 +527,6 @@ export const a: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -658,7 +562,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Fix `a` error with noCheck
 
@@ -669,14 +573,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -712,7 +608,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -720,13 +616,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
@@ -759,14 +655,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -791,7 +679,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -799,13 +687,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js
index db54e7badaee7..60546efaaf56e 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js
@@ -1,8 +1,114 @@
 5:: no-change-run
 Clean build will have check pending since it didnt type check
 Incremental build has typechecked before this so wont have checkPending
-*** Supplied discrepancy explanation but didnt find any difference
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "checkPending": true,
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./project/a.ts"
+    ],
+    [
+      3,
+      "./project/b.ts"
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
 15:: no-change-run
 Clean build will have check pending since it didnt type check
 Incremental build has typechecked before this so wont have checkPending
-*** Supplied discrepancy explanation but didnt find any difference
\ No newline at end of file
+TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
+CleanBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;",
+    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
+  },
+  "root": [
+    [
+      [
+        2,
+        4
+      ],
+      [
+        "./project/a.ts",
+        "./project/b.ts",
+        "./project/c.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "checkPending": true,
+  "version": "FakeTSVersion"
+}
+IncrementalBuild:
+{
+  "fileInfos": {
+    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./project/a.ts": "-16641552193-export const a = \"hello\";",
+    "./project/b.ts": "-13368947479-export const b = 10;",
+    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
+  },
+  "root": [
+    [
+      [
+        2,
+        4
+      ],
+      [
+        "./project/a.ts",
+        "./project/b.ts",
+        "./project/c.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "declaration": true,
+    "module": 2,
+    "outFile": "./outFile.js"
+  },
+  "version": "FakeTSVersion"
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js
index 8f28da86ef503..4feeb67ce2feb 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental.js
@@ -191,14 +191,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -289,7 +281,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -297,14 +289,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -330,7 +314,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -338,18 +322,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -378,22 +354,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -414,11 +376,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -426,14 +391,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
@@ -454,11 +411,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -466,64 +423,7 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
-
-
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"checkPending":true,"version":"FakeTSVersion"}
 
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "checkPending": true,
-  "version": "FakeTSVersion",
-  "size": 734
-}
 
 
 Program root files: [
@@ -544,11 +444,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error with noCheck
 
@@ -797,14 +697,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -895,7 +787,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -903,18 +795,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -943,22 +827,8 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 
@@ -979,11 +849,14 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -994,13 +867,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
@@ -1038,7 +911,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1073,25 +946,21 @@ declare module "c" {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1114,7 +983,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1255,14 +1128,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1370,7 +1235,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1378,18 +1243,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1424,25 +1289,21 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/c.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 898
 }
 
 
@@ -1465,7 +1326,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/workspaces/project/a.ts
+/home/src/workspaces/project/b.ts
+/home/src/workspaces/project/c.ts
 
 No shapes updated in the builder::
 
@@ -1477,74 +1342,8 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"checkPending":true,"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;",
-    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./project/a.ts",
-        "./project/b.ts",
-        "./project/c.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "checkPending": true,
-  "version": "FakeTSVersion",
-  "size": 805
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -1566,11 +1365,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -1578,73 +1377,16 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-5     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in c.ts:1
 
 
 
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;","-9150421116-export const c: number = \"hello\";"],"root":[[2,4]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4],"version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-16641552193-export const a = \"hello\";",
-    "./project/b.ts": "-13368947479-export const b = 10;",
-    "./project/c.ts": "-9150421116-export const c: number = \"hello\";"
-  },
-  "root": [
-    [
-      [
-        2,
-        4
-      ],
-      [
-        "./project/a.ts",
-        "./project/b.ts",
-        "./project/c.ts"
-      ]
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "version": "FakeTSVersion",
-  "size": 785
-}
-
 
 Program root files: [
   "/home/src/workspaces/project/a.ts",
@@ -1665,7 +1407,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
index 025d3cef3fe85..508156bbc3836 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
@@ -133,14 +133,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -177,7 +169,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -185,14 +177,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -215,7 +199,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -223,14 +207,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -252,7 +228,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -260,14 +236,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -289,7 +257,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -297,14 +265,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -327,7 +287,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error with noCheck
 
@@ -468,14 +428,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -512,7 +464,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -520,14 +472,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -549,7 +493,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Add file with error
 
@@ -560,13 +504,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
@@ -696,14 +640,6 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -748,7 +684,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -756,13 +692,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
@@ -795,14 +731,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --noCheck
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
@@ -827,7 +755,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with checking
 
@@ -835,13 +763,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const c: number = "hello";
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in c.ts:1
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
index afa0596ef022a..8aa636b71b750 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
@@ -53,13 +53,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -134,7 +134,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -178,39 +178,24 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 
@@ -222,18 +207,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -241,18 +218,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error but still noEmit
 
@@ -265,18 +234,36 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
 
-5     "module": "amd"
-                ~~~~~
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -319,13 +306,73 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/directuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/indirectuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
   "version": "FakeTSVersion",
-  "size": 1822
+  "size": 2613
 }
 
 
@@ -342,19 +389,19 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -398,39 +445,24 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 
@@ -442,13 +474,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -461,18 +493,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -480,18 +504,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -499,13 +515,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -523,14 +539,38 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -604,7 +644,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -648,39 +688,68 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1849
+  "size": 2595
 }
 
 
@@ -692,14 +761,38 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -711,14 +804,32 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
 
-5     "module": "amd"
-                ~~~~~
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 
@@ -730,14 +841,32 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 
@@ -749,14 +878,38 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in 3 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -773,18 +926,10 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -827,17 +972,33 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
+  ],
   "version": "FakeTSVersion",
-  "size": 1822
+  "size": 2034
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -845,13 +1006,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -926,7 +1087,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -970,39 +1131,24 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 
@@ -1014,18 +1160,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -1033,18 +1171,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -1052,13 +1182,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
index acaa8542ac49b..2eba67bf86944 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
@@ -54,13 +54,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -135,7 +135,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -179,37 +179,22 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 
@@ -221,18 +206,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -240,18 +217,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error but still noEmit
 
@@ -264,18 +233,36 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
 
-6     "module": "amd"
-                ~~~~~
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -318,11 +305,71 @@ Found 1 error in tsconfig.json:6
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/directuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/indirectuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | Dts",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1273
+  "size": 2064
 }
 
 
@@ -339,20 +386,20 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -396,37 +443,22 @@ Found 1 error in tsconfig.json:6
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 
@@ -438,13 +470,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -457,18 +489,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -476,18 +500,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -495,13 +511,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -519,14 +535,38 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:6
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -600,7 +640,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -644,37 +684,66 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1298
+  "size": 2044
 }
 
 
@@ -686,14 +755,38 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:6
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -705,14 +798,32 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
 
-6     "module": "amd"
-                ~~~~~
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
 
-Found 1 error in tsconfig.json:6
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 
@@ -724,14 +835,32 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:6
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 
@@ -743,14 +872,38 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 3 errors in 3 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -767,18 +920,10 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -821,15 +966,31 @@ Found 1 error in tsconfig.json:6
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1271
+  "size": 1483
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -837,13 +998,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -918,7 +1079,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -962,37 +1123,22 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 
@@ -1004,18 +1150,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -1023,18 +1161,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -1042,13 +1172,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
index 064e9ac8bedd8..c20da536756bf 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
@@ -53,13 +53,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -114,7 +114,7 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -157,37 +157,22 @@ function someFunc(arguments) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 
@@ -199,18 +184,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -218,18 +195,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error but still noEmit
 
@@ -242,18 +211,36 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
 
-5     "module": "amd"
-                ~~~~~
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -295,11 +282,71 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/directuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/indirectuse.ts",
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1254
+  "size": 2045
 }
 
 
@@ -316,19 +363,19 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -371,37 +418,22 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 
@@ -413,13 +445,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -432,18 +464,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -451,18 +475,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -470,13 +486,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -494,14 +510,38 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -555,7 +595,7 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -598,37 +638,66 @@ function someFunc(arguments) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1279
+  "size": 2025
 }
 
 
@@ -640,14 +709,38 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -659,14 +752,32 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
 
-5     "module": "amd"
-                ~~~~~
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
 
-Found 1 error in tsconfig.json:5
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 
@@ -678,14 +789,32 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
 
 
 
@@ -697,14 +826,38 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 3 errors in 3 files.
 
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -721,18 +874,10 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -774,15 +919,31 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1252
+  "size": 1467
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -790,13 +951,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -851,7 +1012,7 @@ function someFunc(arguments) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -894,37 +1055,22 @@ function someFunc(arguments) {
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 
@@ -936,18 +1082,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with noEmit
 
@@ -955,18 +1093,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -974,13 +1104,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js
index 25dad0effd0b1..96e62ff6edfe0 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-composite.js
@@ -53,18 +53,10 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,4,3,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -107,21 +99,31 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/src/class.ts",
-    "./project/src/directuse.ts",
-    "./project/src/indirectclass.ts",
-    "./project/src/indirectuse.ts",
-    "./project/src/nochangefile.ts",
-    "./project/src/nochangefilewithemitspecificerror.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1281
+  "size": 1481
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -129,18 +131,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -184,39 +186,24 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -303,18 +290,42 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -358,39 +369,68 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1849
+  "size": 2595
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -477,18 +517,10 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -531,17 +563,33 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
   ],
   "outSignature": "-1966987419-declare module \"src/class\" {\n    export class classC {\n        prop1: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
+  ],
   "version": "FakeTSVersion",
-  "size": 1822
+  "size": 2034
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -549,18 +597,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"outSignature":"8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -604,39 +652,24 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "outSignature": "8998999540-declare module \"src/class\" {\n    export class classC {\n        prop: number;\n    }\n}\ndeclare module \"src/indirectClass\" {\n    import { classC } from \"src/class\";\n    export class indirectClass {\n        classC: classC;\n    }\n}\ndeclare module \"src/directUse\" { }\ndeclare module \"src/indirectUse\" { }\ndeclare module \"src/noChangeFile\" {\n    export function writeLog(s: string): void;\n}\ndeclare function someFunc(arguments: boolean, ...rest: any[]): void;\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 1845
+  "size": 2015
 }
 
 //// [/home/src/workspaces/outFile.js]
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
index 81a258dd5e22a..8b2f6e99759e1 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental-declaration.js
@@ -54,18 +54,10 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,4,3,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -108,21 +100,31 @@ Found 1 error in tsconfig.json:6
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/src/class.ts",
-    "./project/src/directuse.ts",
-    "./project/src/indirectclass.ts",
-    "./project/src/indirectuse.ts",
-    "./project/src/nochangefile.ts",
-    "./project/src/nochangefilewithemitspecificerror.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1283
+  "size": 1483
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -130,18 +132,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,37 +187,22 @@ Found 1 error in tsconfig.json:6
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -302,18 +289,42 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-6     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:6
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -357,37 +368,66 @@ Found 1 error in tsconfig.json:6
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1298
+  "size": 2044
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -474,18 +514,10 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:6
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -528,15 +560,31 @@ Found 1 error in tsconfig.json:6
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 1271
+  "size": 1483
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -544,18 +592,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-6     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:6
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -599,37 +647,22 @@ Found 1 error in tsconfig.json:6
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1466
 }
 
 //// [/home/src/workspaces/outFile.js]
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js
index 0d69e1eeaad6a..2f97c54d2bfc8 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-with-initial-noEmit-incremental.js
@@ -53,18 +53,10 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,4,3,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -106,21 +98,31 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/src/class.ts",
-    "./project/src/directuse.ts",
-    "./project/src/indirectclass.ts",
-    "./project/src/indirectuse.ts",
-    "./project/src/nochangefile.ts",
-    "./project/src/nochangefilewithemitspecificerror.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1264
+  "size": 1467
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -128,18 +130,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -182,37 +184,22 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -279,18 +266,42 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+
+2 new indirectClass().classC.prop;
+                             ~~~~
+
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
+
+src/indirectUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
 
-5     "module": "amd"
-                ~~~~~
+2 new indirectClass().classC.prop;
+                             ~~~~
 
+  src/class.ts:2:5
+    2     prop1 = 1;
+          ~~~~~
+    'prop1' is declared here.
 
-Found 1 error in tsconfig.json:5
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
+
+
+Found 3 errors in 3 files.
+
+Errors  Files
+     1  src/directUse.ts:2
+     1  src/indirectUse.ts:2
+     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","1786859709-export class classC {\n    prop1 = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[4,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[5,[{"start":76,"length":4,"code":2551,"category":1,"messageText":"Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?","relatedInformation":[{"file":"./project/src/class.ts","start":26,"length":5,"messageText":"'prop1' is declared here.","category":3,"code":2728}]}]],[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -333,37 +344,66 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/directuse.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 76,
+          "length": 4,
+          "code": 2551,
+          "category": 1,
+          "messageText": "Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?",
+          "relatedInformation": [
+            {
+              "file": "./project/src/class.ts",
+              "start": 26,
+              "length": 5,
+              "messageText": "'prop1' is declared here.",
+              "category": 3,
+              "code": 2728
+            }
+          ]
+        }
+      ]
     ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1279
+  "size": 2025
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -430,18 +470,10 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:5
-
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -483,15 +515,31 @@ Found 1 error in tsconfig.json:5
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/src/class.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/src/nochangefilewithemitspecificerror.ts",
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 1252
+  "size": 1467
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: No Change run with emit
 
@@ -499,18 +547,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 
-5     "module": "amd"
-                ~~~~~
+1 function someFunc(arguments: boolean, ...rest: any[]) {
+                    ~~~~~~~~~~~~~~~~~~
 
 
-Found 1 error in tsconfig.json:5
+Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/src/class.ts","./project/src/indirectclass.ts","./project/src/directuse.ts","./project/src/indirectuse.ts","./project/src/nochangefile.ts","./project/src/nochangefilewithemitspecificerror.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","545032748-export class classC {\n    prop = 1;\n}","6324910780-import { classC } from './class';\nexport class indirectClass {\n    classC = new classC();\n}","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","-8953710208-import { indirectClass } from './indirectClass';\nnew indirectClass().classC.prop;","6714567633-export function writeLog(s: string) {\n}","-19339541508-function someFunc(arguments: boolean, ...rest: any[]) {\n}"],"root":[[2,7]],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[7,[{"start":18,"length":18,"messageText":"Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.","category":1,"code":2396,"skippedOn":"noEmit"}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -553,37 +601,22 @@ Found 1 error in tsconfig.json:5
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/class.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectclass.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/directuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/indirectuse.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/src/nochangefile.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/src/nochangefilewithemitspecificerror.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 18,
+          "length": 18,
+          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
+          "category": 1,
+          "code": 2396,
+          "skippedOn": "noEmit"
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1277
+  "size": 1447
 }
 
 //// [/home/src/workspaces/outFile.js]
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
index 1d8d54232113c..41a17bfdfad3c 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-multiple-files.js
@@ -38,18 +38,10 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,4,5,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -85,15 +77,12 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts",
-    "./project/d.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 853
+  "size": 845
 }
 
 
@@ -119,11 +108,16 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
+/home/src/projects/project/c.ts
+/home/src/projects/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -131,14 +125,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -164,11 +150,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -176,18 +162,47 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
+
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const c = class { private p = 10; };
+               ~
+
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
+
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
 
 
-Found 1 error in tsconfig.json:4
+Found 3 errors in 3 files.
 
+Errors  Files
+     1  a.ts:1
+     1  c.ts:1
+     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,4,5,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -224,15 +239,77 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts",
-    "./project/d.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 872
+  "size": 1725
 }
 
 
@@ -259,7 +336,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -271,18 +348,47 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
+
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const c = class { private p = 10; };
+               ~
+
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
 
-4     "module": "amd",
-                ~~~~~
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
 
 
-Found 1 error in tsconfig.json:4
+Found 3 errors in 3 files.
 
+Errors  Files
+     1  a.ts:1
+     1  c.ts:1
+     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,4,5,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -320,15 +426,77 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "./project/c.ts",
-    "./project/d.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 894
+  "size": 1747
 }
 
 
@@ -356,7 +524,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -368,14 +536,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -401,11 +561,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Dts Emit with error
 
@@ -443,23 +603,17 @@ Output::
                    ~
     Add a type annotation to the variable d.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 4 errors in 4 files.
+Found 3 errors in 3 files.
 
 Errors  Files
      1  a.ts:1
      1  c.ts:1
      1  d.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3,4,5],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]],[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -496,28 +650,6 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/c.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/d.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -584,7 +716,7 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1749
+  "size": 1708
 }
 
 //// [/home/src/projects/outFile.js]
@@ -652,7 +784,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -667,18 +799,10 @@ export const a = class { public p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -714,8 +838,9 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 844
@@ -744,11 +869,16 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
+/home/src/projects/project/c.ts
+/home/src/projects/project/d.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: With declaration enabled noEmit
 
@@ -756,18 +886,36 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const c = class { private p = 10; };
+               ~
+
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
+
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  c.ts:1
+     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -804,11 +952,56 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 863
+  "size": 1445
 }
 
 
@@ -835,7 +1028,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -847,18 +1040,36 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const c = class { private p = 10; };
+               ~
+
+  c.ts:1:14
+    1 export const c = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable c.
+
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
 
 
-Found 1 error in tsconfig.json:4
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  c.ts:1
+     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-17233149573-export const c = class { private p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[4,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable c.","category":1,"code":9027}]}]],[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -896,11 +1107,56 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/c.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable c.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ],
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 885
+  "size": 1467
 }
 
 
@@ -928,7 +1184,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -943,18 +1199,23 @@ export const c = class { public p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const d = class { private p = 10; };
+               ~
+
+  d.ts:1:14
+    1 export const d = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable d.
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in d.ts:1
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-15184115393-export const c = class { public p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,4],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9483521475-export const a = class { public p = 10; };","-13368947479-export const b = 10;","-15184115393-export const c = class { public p = 10; };","2523684124-export const d = class { private p = 10; };"],"root":[[2,5]],"options":{"declaration":true,"declarationMap":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[5,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable d.","category":1,"code":9027}]}]]],"pendingEmit":49,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -992,12 +1253,35 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/c.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/d.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable d.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit | DtsMap",
+    49
   ],
   "version": "FakeTSVersion",
-  "size": 886
+  "size": 1187
 }
 
 
@@ -1025,7 +1309,12 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
+/home/src/projects/project/c.ts
+/home/src/projects/project/d.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
deleted file mode 100644
index c31c43cffeb6f..0000000000000
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
+++ /dev/null
@@ -1,103 +0,0 @@
-7:: no-change-run
-*** Needs explanation
-Incremental build contains ./project/a.ts file has emit errors, clean build does not have errors or does not mark is as pending emit: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
-Incremental buildInfoText:: {
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-9502176711-export const a = class { private p = 10; };",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
-  "emitDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
-          "category": 1,
-          "code": 4094,
-          "relatedInformation": [
-            {
-              "start": 13,
-              "length": 1,
-              "messageText": "Add a type annotation to the variable a.",
-              "category": 1,
-              "code": 9027
-            }
-          ]
-        }
-      ]
-    ]
-  ],
-  "version": "FakeTSVersion",
-  "size": 1035
-}
-Clean buildInfoText:: {
-  "fileNames": [
-    "../tslibs/ts/lib/lib.d.ts",
-    "./project/a.ts",
-    "./project/b.ts"
-  ],
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./project/a.ts": "-9502176711-export const a = class { private p = 10; };",
-    "./project/b.ts": "-13368947479-export const b = 10;"
-  },
-  "root": [
-    [
-      2,
-      "./project/a.ts"
-    ],
-    [
-      3,
-      "./project/b.ts"
-    ]
-  ],
-  "options": {
-    "declaration": true,
-    "module": 2,
-    "outFile": "./outFile.js"
-  },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
-  ],
-  "version": "FakeTSVersion",
-  "size": 716
-}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index 09b5df0b9823f..7ec3b6bb5f4f4 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -33,18 +33,23 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -73,13 +78,35 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 1015
 }
 
 
@@ -102,7 +129,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -114,13 +144,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
@@ -144,7 +179,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -159,18 +194,10 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -199,13 +226,12 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 701
+  "size": 694
 }
 
 
@@ -228,11 +254,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -240,14 +269,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -270,11 +291,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -282,18 +303,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -322,22 +335,8 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 //// [/home/src/projects/outFile.js]
@@ -383,11 +382,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -395,14 +394,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -425,11 +416,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -440,18 +431,23 @@ export const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -480,11 +476,35 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 712
+  "size": 1015
 }
 
 
@@ -507,7 +527,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -529,21 +552,13 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in a.ts:1
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  a.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -572,20 +587,6 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -610,7 +611,7 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 //// [/home/src/projects/outFile.js]
@@ -652,7 +653,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -664,13 +665,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
@@ -694,7 +700,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index a98c258b41a4e..0e4490907f703 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -32,18 +32,10 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -71,13 +63,12 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 697
+  "size": 693
 }
 
 
@@ -99,11 +90,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -111,14 +105,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -140,11 +126,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix error
 
@@ -155,18 +141,10 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -194,13 +172,12 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -222,11 +199,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -234,14 +214,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -263,11 +235,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -275,18 +247,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -314,22 +278,8 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -365,11 +315,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -377,14 +327,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -406,11 +348,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -421,18 +363,10 @@ export const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -460,8 +394,9 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 693
@@ -486,11 +421,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: Emit when error
 
@@ -498,18 +436,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -537,22 +467,8 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 710
+  "size": 673
 }
 
 //// [/home/src/projects/outFile.js]
@@ -593,11 +509,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -605,14 +521,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -634,8 +542,8 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index 64b42ff93e7dc..f3a878ab7c3d4 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -32,18 +32,18 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -71,13 +71,26 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 689
+  "size": 837
 }
 
 
@@ -99,7 +112,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -111,13 +127,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
@@ -140,7 +156,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -155,18 +171,10 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -194,13 +202,12 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -222,11 +229,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -234,14 +244,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -263,11 +265,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -275,18 +277,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -314,22 +308,8 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -365,11 +345,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -377,14 +357,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -406,11 +378,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
@@ -421,18 +393,18 @@ export const a: number = "hello"
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -460,11 +432,26 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 685
+  "size": 837
 }
 
 
@@ -486,7 +473,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -498,18 +488,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -538,21 +528,21 @@ Found 1 error in tsconfig.json:4
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 702
+  "size": 817
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -574,7 +564,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -586,13 +576,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in a.ts:1
 
 
 
@@ -615,7 +605,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index deb0c973ee171..12d7a26df904b 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -155,18 +155,10 @@ export const a = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -194,13 +186,12 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -222,11 +213,14 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -234,14 +228,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -263,11 +249,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Emit after fixing error
 
@@ -275,18 +261,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -314,22 +292,8 @@ Found 1 error in tsconfig.json:4
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -365,11 +329,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -377,14 +341,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -406,11 +362,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Introduce error
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
index 2c3c2f450fa64..e9687a24ee21a 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration-with-incremental.js
@@ -44,18 +44,23 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
 
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
-Found 1 error in tsconfig.json:4
+
+Found 1 error in src/main.ts:2
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"emitDiagnosticsPerFile":[[3,[{"start":53,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":53,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -90,13 +95,35 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "emitDiagnosticsPerFile": [
+    [
+      "./noemitonerror/src/main.ts",
+      [
+        {
+          "start": 53,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 53,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
   "pendingEmit": [
-    "Js | Dts",
-    false
+    "Js | DtsEmit",
+    17
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 945
+  "size": 1234
 }
 
 
@@ -136,13 +163,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
 
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
-Found 1 error in tsconfig.json:4
+
+Found 1 error in src/main.ts:2
 
 
 
@@ -184,18 +216,10 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -230,15 +254,51 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 937
+  "size": 903
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -268,7 +328,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -276,14 +336,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -311,4 +363,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js
index 58d5c80a6adf0..df083cf418c6b 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-declaration.js
@@ -43,13 +43,18 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
 
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
-Found 1 error in tsconfig.json:4
+
+Found 1 error in src/main.ts:2
 
 
 
@@ -81,13 +86,18 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+2 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 
-Found 1 error in tsconfig.json:4
+Found 1 error in src/main.ts:2
 
 
 
@@ -124,14 +134,47 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
 
 
 
@@ -154,7 +197,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -162,16 +205,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -192,4 +229,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js
index 0c81f53526773..5a605c67969e1 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors-with-incremental.js
@@ -43,18 +43,33 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -88,13 +103,8 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 926
+  "size": 892
 }
 
 
@@ -125,7 +135,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -133,14 +143,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -167,7 +169,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix error
 
@@ -180,18 +182,11 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -225,13 +220,8 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 918
+  "size": 884
 }
 
 
@@ -262,7 +252,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -270,14 +260,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -304,4 +286,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
index ce30693e568a1..147b64698a5f4 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
@@ -42,14 +42,29 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
 
 
 
@@ -71,7 +86,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -79,16 +94,9 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -108,7 +116,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: Fix error
 
@@ -121,16 +129,9 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -150,7 +151,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -158,16 +159,9 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -187,4 +181,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js
index 12a40d19e6593..6723d3aea5e8e 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/file-deleted-before-fixing-error-with-noEmitOnError.js
@@ -37,17 +37,9 @@ Output::
 1 export const x: 30 = "hello";
                ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in file1.ts:1
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  file1.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
@@ -141,17 +133,9 @@ Output::
 1 export const x: 30 = "hello";
                ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors in 2 files.
+Found 1 error in file1.ts:1
 
-Errors  Files
-     1  file1.ts:1
-     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
index 0fc0fa59703bd..466231c92a6c4 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration-with-incremental.js
@@ -48,17 +48,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:2
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -161,17 +153,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in src/main.ts:2
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 
@@ -211,18 +195,10 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -257,15 +233,39 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 895
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -295,7 +295,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -303,14 +303,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -338,4 +330,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js
index 5f7d3d5068b43..bca705c5ddeac 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-declaration.js
@@ -47,17 +47,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:2
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 
@@ -93,17 +85,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in src/main.ts:2
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 
@@ -138,14 +122,35 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
 
 
 
@@ -168,7 +173,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -176,16 +181,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -206,4 +205,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js
index f4f7798f30ec8..386dd6780de8f 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors-with-incremental.js
@@ -47,17 +47,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:2
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -158,17 +150,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in src/main.ts:2
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 
@@ -207,18 +191,10 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -252,15 +228,27 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 910
+  "size": 876
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -289,7 +277,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -297,14 +285,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -331,4 +311,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
index 46ba04a0df3df..8446f3efd33b4 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
@@ -46,17 +46,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:2
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 
@@ -91,17 +83,9 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors in 2 files.
+Found 1 error in src/main.ts:2
 
-Errors  Files
-     1  src/main.ts:2
-     1  tsconfig.json:4
 
 
 
@@ -135,14 +119,23 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
 
 
 
@@ -164,7 +157,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -172,16 +165,9 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -201,4 +187,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
index 43e79a0e03d90..eabe9c4f666c3 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration-with-incremental.js
@@ -51,17 +51,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:4
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -151,17 +143,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in src/main.ts:4
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 
@@ -203,18 +187,10 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -249,15 +225,41 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 938
+  "size": 904
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -287,7 +289,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -295,14 +297,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -330,4 +324,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js
index 99560ff0d1723..60e85c91f2f2a 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-declaration.js
@@ -50,17 +50,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:4
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 
@@ -96,17 +88,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in src/main.ts:4
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 
@@ -143,14 +127,37 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
 
 
 
@@ -173,7 +180,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -181,16 +188,10 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -211,4 +212,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js
index 576723c6e81f4..6c735363bc927 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors-with-incremental.js
@@ -50,17 +50,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:4
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -148,17 +140,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
 
+Found 1 error in src/main.ts:4
 
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 
@@ -199,18 +183,10 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -244,15 +220,29 @@ Found 1 error in tsconfig.json:4
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 919
+  "size": 885
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -281,7 +271,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -289,14 +279,6 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
 
@@ -323,4 +305,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
index 22adb7f488664..e64ada1da1822 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
@@ -49,17 +49,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-4     "module": "amd",
-                ~~~~~
+Found 1 error in src/main.ts:4
 
-
-Found 2 errors in 2 files.
-
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 
@@ -94,17 +86,9 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
 
-Found 2 errors in 2 files.
+Found 1 error in src/main.ts:4
 
-Errors  Files
-     1  src/main.ts:4
-     1  tsconfig.json:4
 
 
 
@@ -140,14 +124,25 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
+
+
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
 
 
 
@@ -169,7 +164,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
 
 Change:: no-change-run
 
@@ -177,16 +172,9 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-
-Found 1 error in tsconfig.json:4
-
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -206,4 +194,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js b/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js
index 7df36960b23ac..0e47ded1c8d30 100644
--- a/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js
+++ b/tests/baselines/reference/tsc/projectReferences/when-project-contains-invalid-project-reference.js
@@ -33,11 +33,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
 tsconfig.json:7:5 - error TS6053: File '/home/src/workspaces/Util/Dates' not found.
 
 7     {
@@ -48,7 +43,7 @@ Output::
   ~~~~~
 
 
-Found 2 errors in the same file, starting at: tsconfig.json:3
+Found 1 error in tsconfig.json:7
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index f501d26c4111a..6edd70cf442c5 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -43,12 +43,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "system",
-                ~~~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -151,7 +146,13 @@ Program files::
 /home/src/projects/a/b/globalFile3.ts
 /home/src/projects/a/b/moduleFile2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/a/b/moduleFile1.ts
+/home/src/projects/a/b/file1Consumer1.ts
+/home/src/projects/a/b/file1Consumer2.ts
+/home/src/projects/a/b/globalFile3.ts
+/home/src/projects/a/b/moduleFile2.ts
 
 No shapes updated in the builder::
 
@@ -176,12 +177,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "system",
-                ~~~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -258,7 +254,13 @@ Program files::
 /home/src/projects/a/b/globalFile3.ts
 /home/src/projects/a/b/moduleFile2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/a/b/moduleFile1.ts
+/home/src/projects/a/b/file1Consumer1.ts
+/home/src/projects/a/b/file1Consumer2.ts
+/home/src/projects/a/b/globalFile3.ts
+/home/src/projects/a/b/moduleFile2.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index ee90c305f145e..8dd4e5f86e7c7 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -38,12 +38,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -97,7 +92,10 @@ Program files::
 /home/src/projects/a/rootFolder/project/Scripts/Javascript.js
 /home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/a/rootFolder/project/Scripts/Javascript.js
+/home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -125,12 +123,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -158,7 +151,10 @@ Program files::
 /home/src/projects/a/rootFolder/project/Scripts/Javascript.js
 /home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/a/rootFolder/project/Scripts/Javascript.js
+/home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts
 
 Shape signatures in builder refreshed for::
 /home/src/projects/a/rootfolder/project/scripts/typescript.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 98ac3ae0ec52e..caaf17f7f40dc 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -58,11 +58,6 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "system"
-                ~~~~~~~~
-
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 XY/a.ts
@@ -72,7 +67,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -168,7 +163,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/XY/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -209,11 +208,6 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "system"
-                ~~~~~~~~
-
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 XY/a.ts
@@ -223,7 +217,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -298,7 +292,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/XY/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index 44d4de5e70060..f4183bd7de0a0 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -58,11 +58,6 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "system"
-                ~~~~~~~~
-
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 XY/a.ts
@@ -72,7 +67,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
@@ -168,7 +163,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/XY/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -209,11 +208,6 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "system"
-                ~~~~~~~~
-
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 XY/a.ts
@@ -223,7 +217,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -298,7 +292,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/XY/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index b34c4d9914ad0..0f9d7c1f5bb83 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -58,10 +58,13 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/xY/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
+  The file is in the program because:
+    Imported via "./xY/a" from file '/user/username/projects/myproject/b.ts'
+    Matched by default include pattern '**/*'
 
-5     "module": "system"
-                ~~~~~~~~
+2 import { a } from "./xY/a";
+                    ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -168,7 +171,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/xY/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -209,10 +216,13 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/xY/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
+  The file is in the program because:
+    Imported via "./xY/a" from file '/user/username/projects/myproject/b.ts'
+    Matched by default include pattern '**/*'
 
-5     "module": "system"
-                ~~~~~~~~
+2 import { a } from "./xY/a";
+                    ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -298,7 +308,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/xY/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index f0db343a30fc1..076103fac39b2 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -58,10 +58,13 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
+  The file is in the program because:
+    Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
+    Matched by default include pattern '**/*'
 
-5     "module": "system"
-                ~~~~~~~~
+2 import { a } from "./Xy/a";
+                    ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -168,7 +171,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/Xy/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -209,10 +216,13 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
+  The file is in the program because:
+    Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
+    Matched by default include pattern '**/*'
 
-5     "module": "system"
-                ~~~~~~~~
+2 import { a } from "./Xy/a";
+                    ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -298,7 +308,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/Xy/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index 950f873234a9a..f39718c584e2c 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -58,10 +58,13 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
+  The file is in the program because:
+    Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
+    Matched by default include pattern '**/*'
 
-5     "module": "system"
-                ~~~~~~~~
+2 import { a } from "./Xy/a";
+                    ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -168,7 +171,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/Xy/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
@@ -209,10 +216,13 @@ Synchronizing program
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/b.ts","/user/username/projects/myproject/XY/a.ts"]
   options: {"forceConsistentCasingInFileNames":true,"outFile":"/user/username/projects/myproject/out.js","module":4,"watch":true,"project":"/user/username/projects/myproject","explainFiles":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-tsconfig.json:5:15 - error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
+  The file is in the program because:
+    Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
+    Matched by default include pattern '**/*'
 
-5     "module": "system"
-                ~~~~~~~~
+2 import { a } from "./Xy/a";
+                    ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -298,7 +308,11 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/Xy/a.ts
+/user/username/projects/myproject/link/a.ts
+/user/username/projects/myproject/b.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-incremental.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-incremental.js
index 06308dd8e8556..eea028277261e 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-incremental.js
@@ -38,11 +38,8 @@ Output::
 
 //// [/users/username/projects/project/src/index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var classnames_1 = __importDefault(require("classnames"));
+var classnames_1 = require("classnames");
 (0, classnames_1.default)().foo;
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index 4a798134b7d82..37f0f1d2776d6 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -43,11 +43,8 @@ Output::
 
 //// [/users/username/projects/project/src/index.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var classnames_1 = __importDefault(require("classnames"));
+var classnames_1 = require("classnames");
 (0, classnames_1.default)().foo;
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-incremental.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-incremental.js
index a2ad91a6497bd..e50bc541c317b 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-incremental.js
@@ -10,8 +10,7 @@ export const y: string = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd",
-    "ignoreDeprecations": "6.0"
+    "module": "amd"
   }
 }
 
@@ -128,7 +127,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
@@ -248,7 +246,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
index 7673fbdba0516..9b04daa30245b 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
@@ -10,8 +10,7 @@ export const y: string = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd",
-    "ignoreDeprecations": "6.0"
+    "module": "amd"
   }
 }
 
@@ -150,7 +149,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
@@ -313,7 +311,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-incremental.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-incremental.js
index 6d7a88da066a5..8463ca7d652b0 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-incremental.js
@@ -10,8 +10,7 @@ export const y = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd",
-    "ignoreDeprecations": "6.0"
+    "module": "amd"
   }
 }
 
@@ -106,7 +105,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
@@ -204,7 +202,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
index 1e464b0c5fcd6..8e17008971c13 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
@@ -10,8 +10,7 @@ export const y = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd",
-    "ignoreDeprecations": "6.0"
+    "module": "amd"
   }
 }
 
@@ -131,7 +130,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
@@ -275,7 +273,6 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
-  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-incremental.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-incremental.js
index 73d91647ebd64..2f055e5e35b4f 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-incremental.js
@@ -11,8 +11,7 @@ export const y = 20;
   "compilerOptions": {
     "incremental": true,
     "module": "amd",
-    "outFile": "out.js",
-    "ignoreDeprecations": "6.0"
+    "outFile": "out.js"
   }
 }
 
@@ -92,7 +91,6 @@ Program options: {
   "incremental": true,
   "module": 2,
   "outFile": "/users/username/projects/project/out.js",
-  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js
index f5195729a96bf..7f8e6c6a90dcc 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js
@@ -11,8 +11,7 @@ export const y = 20;
   "compilerOptions": {
     "incremental": true,
     "module": "amd",
-    "outFile": "out.js",
-    "ignoreDeprecations": "6.0"
+    "outFile": "out.js"
   }
 }
 
@@ -117,7 +116,6 @@ Program options: {
   "incremental": true,
   "module": 2,
   "outFile": "/users/username/projects/project/out.js",
-  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/late-discovered-dependency-symlink.js b/tests/baselines/reference/tscWatch/moduleResolution/late-discovered-dependency-symlink.js
index d56d4a82aa937..638eb10a55869 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/late-discovered-dependency-symlink.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/late-discovered-dependency-symlink.js
@@ -148,42 +148,9 @@ index.ts
 
 //// [/home/src/workspace/packageC/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-var pkg = __importStar(require("package-b"));
+var pkg = require("package-b");
 exports.a = pkg.invoke();
 
 
@@ -326,42 +293,9 @@ index.ts
 
 //// [/home/src/workspace/packageC/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aa = void 0;
-var pkg = __importStar(require("package-b"));
+var pkg = require("package-b");
 exports.aa = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index c346f07ce880c..ceb219d94b3ef 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
@@ -37,17 +37,22 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+
+1 export const a = class { private p = 10; };
+               ~
 
-4     "module": "amd",
-                ~~~~~
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -76,13 +81,35 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 1015
 }
 
 
@@ -125,7 +152,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -150,17 +180,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -189,13 +214,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 701
+  "size": 694
 }
 
 
@@ -219,7 +243,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -251,17 +278,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -290,22 +312,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 714
+  "size": 677
 }
 
 //// [/home/src/projects/outFile.js]
@@ -352,7 +360,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -385,12 +393,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -415,7 +418,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -440,17 +443,22 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -479,11 +487,35 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "emitDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 13,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 712
+  "size": 1015
 }
 
 
@@ -507,7 +539,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -549,17 +584,12 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"declaration":true,"module":2,"outFile":"./outFile.js"},"emitDiagnosticsPerFile":[[2,[{"start":13,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":13,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -588,20 +618,6 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -626,7 +642,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 998
 }
 
 //// [/home/src/projects/outFile.js]
@@ -669,7 +685,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -702,10 +718,15 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a = class { private p = 10; };
+               ~
+
+  a.ts:1:14
+    1 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -732,7 +753,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
index 8fce34a246c7a..40c113038446f 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-without-dts-enabled-with-incremental-as-modules.js
@@ -36,17 +36,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -74,13 +69,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 697
+  "size": 693
 }
 
 
@@ -122,7 +116,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -147,17 +144,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,13 +177,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -214,7 +205,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -245,17 +239,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -283,22 +272,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -335,7 +310,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -367,12 +342,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -396,7 +366,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -421,17 +391,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -459,8 +424,9 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
   "size": 693
@@ -486,7 +452,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -517,17 +486,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-9502176711-export const a = class { private p = 10; };","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -555,22 +519,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 710
+  "size": 673
 }
 
 //// [/home/src/projects/outFile.js]
@@ -612,7 +562,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -644,12 +594,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -673,7 +618,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
index e0ed5489f40a1..d720f00bcdc4b 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/semantic-errors-with-incremental-as-modules.js
@@ -36,17 +36,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -74,13 +74,26 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 689
+  "size": 837
 }
 
 
@@ -122,7 +135,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -147,17 +163,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,13 +196,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -214,7 +224,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -245,17 +258,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -283,22 +291,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -335,7 +329,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -367,12 +361,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -396,7 +385,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -421,17 +410,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -459,11 +448,26 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts"
+  "semanticDiagnosticsPerFile": [
+    [
+      "./project/a.ts",
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
+    ]
+  ],
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 685
+  "size": 837
 }
 
 
@@ -486,7 +490,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -517,17 +524,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-11417512537-export const a: number = \"hello\"","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[[2,[{"start":13,"length":1,"code":2322,"category":1,"messageText":"Type 'string' is not assignable to type 'number'."}]]],"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -556,21 +563,21 @@ Output::
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
+      [
+        {
+          "start": 13,
+          "length": 1,
+          "code": 2322,
+          "category": 1,
+          "messageText": "Type 'string' is not assignable to type 'number'."
+        }
+      ]
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 702
+  "size": 817
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -593,7 +600,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -625,10 +632,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
 
-4     "module": "amd",
-                ~~~~~
+1 export const a: number = "hello"
+               ~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -654,7 +661,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
index 1805c3fd022c1..2e2f12f1b193e 100644
--- a/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
+++ b/tests/baselines/reference/tscWatch/noEmit/outFile/syntax-errors-with-incremental-as-modules.js
@@ -147,17 +147,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"changeFileSet":[2,3,1],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"pendingEmit":false,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,13 +180,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./project/a.ts",
-    "./project/b.ts",
-    "../tslibs/ts/lib/lib.d.ts"
+  "pendingEmit": [
+    "Js",
+    false
   ],
   "version": "FakeTSVersion",
-  "size": 682
+  "size": 678
 }
 
 
@@ -214,7 +208,10 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/home/src/projects/project/a.ts
+/home/src/projects/project/b.ts
 
 No shapes updated in the builder::
 
@@ -245,17 +242,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16641552193-export const a = \"hello\";","-13368947479-export const b = 10;"],"root":[2,3],"options":{"module":2,"outFile":"./outFile.js"},"version":"FakeTSVersion"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -283,22 +275,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/a.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./project/b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "version": "FakeTSVersion",
-  "size": 695
+  "size": 658
 }
 
 //// [/home/src/projects/outFile.js]
@@ -335,7 +313,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -367,12 +345,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -396,7 +369,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
index 5582bd6b1c138..59d41ce6d9b74 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration-with-incremental.js
@@ -54,12 +54,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -201,17 +196,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -246,15 +236,41 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 938
+  "size": 904
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
@@ -330,12 +346,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -467,17 +478,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -512,15 +518,28 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 895
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 
 Program root files: [
@@ -592,17 +611,22 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
+
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"emitDiagnosticsPerFile":[[3,[{"start":53,"length":1,"messageText":"Property 'p' of exported anonymous class type may not be private or protected.","category":1,"code":4094,"relatedInformation":[{"start":53,"length":1,"messageText":"Add a type annotation to the variable a.","category":1,"code":9027}]}]]],"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -637,13 +661,35 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "emitDiagnosticsPerFile": [
+    [
+      "./noemitonerror/src/main.ts",
+      [
+        {
+          "start": 53,
+          "length": 1,
+          "messageText": "Property 'p' of exported anonymous class type may not be private or protected.",
+          "category": 1,
+          "code": 4094,
+          "relatedInformation": [
+            {
+              "start": 53,
+              "length": 1,
+              "messageText": "Add a type annotation to the variable a.",
+              "category": 1,
+              "code": 9027
+            }
+          ]
+        }
+      ]
+    ]
+  ],
   "pendingEmit": [
-    "Js | Dts",
-    false
+    "Js | DtsEmit",
+    17
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 945
+  "size": 1234
 }
 
 
@@ -717,17 +763,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"declaration":true,"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -762,15 +803,51 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 937
+  "size": 903
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
index 07dad3a8821ac..34c56a5897855 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -53,12 +53,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -154,15 +149,41 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" { }
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
@@ -237,12 +258,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -315,15 +331,28 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts] file written with same contents
 
 
 Program root files: [
@@ -394,10 +423,15 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
 
-4     "module": "amd",
-                ~~~~~
+2 export const a = class { private p = 10; };
+               ~
+
+  src/main.ts:2:14
+    2 export const a = class { private p = 10; };
+                   ~
+    Add a type annotation to the variable a.
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -473,15 +507,51 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
+//// [/user/username/projects/dev-build.d.ts]
+declare module "shared/types/db" {
+    export interface A {
+        name: string;
+    }
+}
+declare module "src/main" {
+    export const a: {
+        new (): {
+            p: number;
+        };
+    };
+}
+declare module "src/other" {
+    export {};
+}
+
+
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
index c43d23a19984e..c7e17069417d9 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -53,12 +53,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -198,17 +193,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-2574605496-import { A } from \"../shared/types/db\";\nconst a = {\n    lastName: 'sdsd'\n};","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -242,15 +232,29 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 919
+  "size": 885
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -325,12 +329,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -460,17 +459,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-8373351622-import { A } from \"../shared/types/db\";\nconst a: string = \"hello\";","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -504,15 +498,27 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 910
+  "size": 876
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -583,17 +589,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","5099365167-import { A } from \"../shared/types/db\";\nexport const a = class { private p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -627,15 +628,33 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 926
+  "size": 892
 }
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -706,17 +725,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-5014788164-export interface A {\n    name: string;\n}\n","-614304812-import { A } from \"../shared/types/db\";\nexport const a = class { p = 10; };\n","9084524823-console.log(\"hi\");\nexport { }\n"],"root":[[2,4]],"options":{"module":2,"noEmitOnError":true,"outFile":"./dev-build.js"},"version":"FakeTSVersion"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -750,15 +764,11 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
-  ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 918
+  "size": 884
 }
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
index 4ef5df0fcec3f..2b5575d4e5f47 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -52,12 +52,7 @@ Output::
 4 ;
   ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -152,15 +147,29 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = {
+        lastName: 'sdsd'
+    };
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -234,12 +243,7 @@ Output::
 2 const a: string = 10;
         ~
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -311,15 +315,27 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var a = "hello";
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -389,15 +405,33 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js]
+define("shared/types/db", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+define("src/main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.a = void 0;
+    exports.a = /** @class */ (function () {
+        function class_1() {
+            this.p = 10;
+        }
+        return class_1;
+    }());
+});
+define("src/other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    console.log("hi");
+});
+
+
 
 
 Program root files: [
@@ -467,15 +501,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-4     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
+//// [/user/username/projects/dev-build.js] file written with same contents
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index 1cc1d3a10457d..796e5348ae704 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -34,41 +34,8 @@ Output::
 
 //// [/users/username/projects/project/file1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var T = __importStar(require("./moduleFile"));
+var T = require("./moduleFile");
 T.bar();
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index daa114e6fc071..4936ccf2e1adb 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -104,10 +104,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
-3     "module": "none"
-                ~~~~~~
+1 export {}
+  ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -129,7 +129,9 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/workspace/solution/projects/project/f1.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/workspace/solution/projects/project/f1.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index a7227c5d97511..a80323dc47831 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -43,41 +43,8 @@ function bar() { }
 
 //// [/users/username/projects/project/file1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var T = __importStar(require("./moduleFile"));
+var T = require("./moduleFile");
 T.bar();
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index badf388f96710..d54e758ae732f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -40,41 +40,8 @@ function bar() { }
 
 //// [/users/username/projects/project/file1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var T = __importStar(require("./moduleFile"));
+var T = require("./moduleFile");
 T.bar();
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index a2da72dae84c5..dabb6ea17da73 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -35,12 +35,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -111,7 +106,10 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -148,12 +146,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -216,7 +209,8 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/src/file3.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index f5c4e0295997b..ab9beffbedd67 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -36,12 +36,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -113,7 +108,10 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -150,12 +148,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -219,7 +212,8 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/src/file3.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index b12772984f6c3..714641ce0d29c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -34,12 +34,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -101,7 +96,10 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -138,12 +136,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -201,7 +194,8 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/src/file3.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 90630a3685e48..3f9fe46a99a68 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -34,12 +34,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -98,7 +93,10 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
 
 No shapes updated in the builder::
 
@@ -132,12 +130,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -207,7 +200,11 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
+/user/username/projects/myproject/src/file3.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index 80e410b5d5a6a..43800f1b5ed50 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -34,12 +34,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -109,7 +104,10 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -146,12 +144,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -213,7 +206,8 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/src/file3.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index 58ebd33437d84..9555c0e47fe45 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -33,12 +33,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -99,7 +94,10 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/file1.ts
+/user/username/projects/myproject/src/file2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -136,12 +134,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -198,7 +191,8 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/src/file3.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/src/file3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index a42a452a9637f..946cff2e82750 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -135,12 +135,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-project/tsconfig.json:3:49 - error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3                             "moduleResolution": "classic"
-                                                  ~~~~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -209,7 +204,10 @@ Program files::
 /user/username/workspace/solution/projects/module1.ts
 /user/username/workspace/solution/projects/project/file1.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/workspace/solution/projects/module1.ts
+/user/username/workspace/solution/projects/project/file1.ts
 
 Shape signatures in builder refreshed for::
 /user/username/workspace/solution/projects/module1.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js b/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js
index a058af2dfe756..e859605e03a63 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js
@@ -35,17 +35,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:3:39 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3                             "module": "none",
-                                        ~~~~~~
-
 tsconfig.json:4:29 - error TS5023: Unknown compiler option 'allowAnything'.
 
 4                             "allowAnything": true
                               ~~~~~~~~~~~~~~~
 
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -97,7 +92,10 @@ Program files::
 /user/username/workspace/solution/projects/project/commonFile1.ts
 /user/username/workspace/solution/projects/project/commonFile2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/workspace/solution/projects/project/commonFile1.ts
+/user/username/workspace/solution/projects/project/commonFile2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index ccd1955da9f94..e60834bf2419b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -71,12 +71,7 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory
@@ -99,7 +94,7 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -148,23 +143,9 @@ declare class class2 {
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 909
+  "size": 872
 }
 
 
@@ -213,7 +194,10 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -266,15 +250,66 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
+//// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","errors":true,"version":"FakeTSVersion"}
+
+//// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "../project1/class1.d.ts",
+    "./class2.ts"
+  ],
+  "fileInfos": {
+    "../../../../../../home/src/tslibs/ts/lib/lib.d.ts": {
+      "original": {
+        "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "affectsGlobalScope": true
+      },
+      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "signature": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "affectsGlobalScope": true
+    },
+    "../project1/class1.d.ts": {
+      "original": {
+        "version": "-3469237238-declare class class1 {}",
+        "affectsGlobalScope": true
+      },
+      "version": "-3469237238-declare class class1 {}",
+      "signature": "-3469237238-declare class class1 {}",
+      "affectsGlobalScope": true
+    },
+    "./class2.ts": {
+      "original": {
+        "version": "777969115-class class2 {}",
+        "signature": "-2684084705-declare class class2 {\n}\n",
+        "affectsGlobalScope": true
+      },
+      "version": "777969115-class class2 {}",
+      "signature": "-2684084705-declare class class2 {\n}\n",
+      "affectsGlobalScope": true
+    }
+  },
+  "root": [
+    [
+      3,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 0
+  },
+  "latestChangedDtsFile": "./class2.d.ts",
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 886
+}
+
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -324,7 +359,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -396,18 +431,13 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -466,27 +496,9 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 1013
+  "size": 974
 }
 
 
@@ -539,7 +551,11 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project1/class3.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.d.ts (used version)
@@ -612,18 +628,13 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -673,10 +684,6 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "module": 0
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "../project1/class1.d.ts",
       "not cached or not changed"
@@ -688,7 +695,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 909
+  "size": 907
 }
 
 
@@ -744,7 +751,9 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class1.d.ts (used version)
@@ -818,18 +827,13 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -888,27 +892,9 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 1013
+  "size": 974
 }
 
 
@@ -961,7 +947,11 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project1/class3.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 61dc8203d60ca..252f19350f66e 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -199,51 +199,18 @@ export declare function multiply(a: number, b: number): number;
 }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -322,46 +289,13 @@ export declare const m: typeof mod;
 
 //// [/user/username/projects/sample1/tests/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
-var c = __importStar(require("../core/index"));
-var logic = __importStar(require("../logic/index"));
+var c = require("../core/index");
+var logic = require("../logic/index");
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 
 
@@ -589,51 +523,18 @@ export const m = mod;
 function foo() { }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAK,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function foo() { }
 //# sourceMappingURL=index.js.map
@@ -722,52 +623,19 @@ export const m = mod;
 function foo() { }export function gfoo() { }
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAGiB,oBAA0B;AAN5C,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAK,CAAC;AAAA,SAAgB,IAAI,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAGiB,oBAA0B;AAN5C,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,GAAG,KAAK,CAAC;AAAA,SAAgB,IAAI,KAAK,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
 exports.gfoo = gfoo;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function foo() { }
 function gfoo() { }
@@ -1031,48 +899,15 @@ Input::
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
 exports.gfoo = gfoo;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 function foo() { }
 function gfoo() { }
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
index 2cf55990c381f..b558a00f86460 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
@@ -231,51 +231,18 @@ logic/index.ts
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAEC;AAHD,+CAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,yDAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,0CAEC;AAHD,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
 
 //// [/user/username/projects/sample1/logic/index.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.m = void 0;
 exports.getSecondsInDay = getSecondsInDay;
-var c = __importStar(require("../core/index"));
+var c = require("../core/index");
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = __importStar(require("../core/anotherModule"));
+var mod = require("../core/anotherModule");
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
index cdcf37e4ea990..018d027e4bed7 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
@@ -152,7 +152,7 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-8728835846-export declare class A {\n}\n",{"version":"-19869990292-import {A} from \"a\";export const b = new A();","signature":"1870369234-import { A } from \"a\";\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-8728835846-export declare class A {\n}\n",{"version":"-19869990292-import {A} from \"a\";export const b = new A();","signature":"1870369234-import { A } from \"a\";\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -203,23 +203,9 @@ export declare const b: A;
       "./a.d.ts"
     ]
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./a.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./b.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./b.d.ts",
   "version": "FakeTSVersion",
-  "size": 914
+  "size": 877
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index 049198a748d5f..cf5a68b052387 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -26,9 +26,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+1 import {x} from "f1"
+                  ~~~~
+
+f1.ts:1:1 - error TS2304: Cannot find name 'foo'.
+
+1 foo()
+  ~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -74,7 +82,10 @@ Program files::
 /users/username/projects/project/f1.ts
 /users/username/projects/project/d/f0.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/users/username/projects/project/f1.ts
+/users/username/projects/project/d/f0.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -103,9 +114,22 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+1 import {x} from "f1"
+                  ~~~~
+
+d/f0.ts:2:33 - error TS2322: Type 'number' is not assignable to type 'string'.
+
+2                             var x: string = 1;
+                                  ~
+
+f1.ts:1:1 - error TS2304: Cannot find name 'foo'.
+
+1 foo()
+  ~~~
+
+[HH:MM:SS AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -131,7 +155,8 @@ Program files::
 /users/username/projects/project/f1.ts
 /users/username/projects/project/d/f0.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/users/username/projects/project/d/f0.ts
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/d/f0.ts (computed .d.ts)
@@ -157,7 +182,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+d/f0.ts:1:17 - error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+
+1 import {x} from "f2"
+                  ~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -211,7 +239,8 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /users/username/projects/project/d/f0.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/users/username/projects/project/d/f0.ts
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/d/f0.ts (computed .d.ts)
@@ -237,9 +266,17 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+1 import {x} from "f1"
+                  ~~~~
+
+f1.ts:1:1 - error TS2304: Cannot find name 'foo'.
+
+1 foo()
+  ~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -289,7 +326,10 @@ Program files::
 /users/username/projects/project/f1.ts
 /users/username/projects/project/d/f0.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/users/username/projects/project/f1.ts
+/users/username/projects/project/d/f0.ts
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/f1.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index 17bf5ddff73e8..21aaa0cb97c48 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -23,7 +23,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+
+1 import {x} from "bar"
+                  ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -68,7 +71,9 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /users/username/projects/project/foo.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/users/username/projects/project/foo.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -99,9 +104,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -149,7 +152,9 @@ Program files::
 /users/username/projects/project/bar.d.ts
 /users/username/projects/project/foo.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/users/username/projects/project/bar.d.ts
+/users/username/projects/project/foo.ts
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/bar.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index 8f8c7d3238219..8abfff099e72f 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -26,9 +26,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -68,7 +66,10 @@ Program files::
 /users/username/projects/project/bar.d.ts
 /users/username/projects/project/foo.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/users/username/projects/project/bar.d.ts
+/users/username/projects/project/foo.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -96,7 +97,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+
+1 import {x} from "bar"
+                  ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -143,7 +147,8 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /users/username/projects/project/foo.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/users/username/projects/project/foo.ts
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/foo.ts (computed .d.ts)
@@ -178,9 +183,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -225,7 +228,9 @@ Program files::
 /users/username/projects/project/bar.d.ts
 /users/username/projects/project/foo.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/users/username/projects/project/bar.d.ts
+/users/username/projects/project/foo.ts
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/bar.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index e1f603739a710..dc306545b150a 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -42,12 +42,7 @@ Output::
             ~~~~~~~~~~~~~~~~~
     File is entry point of type library specified here.
 
-tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -164,12 +159,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -217,7 +207,10 @@ Program files::
 /user/username/projects/myproject/lib/app.ts
 /user/username/projects/myproject/node_modules/@myapp/ts-types/types/somefile.define.d.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/lib/app.ts
+/user/username/projects/myproject/node_modules/@myapp/ts-types/types/somefile.define.d.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/node_modules/@myapp/ts-types/types/somefile.define.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js b/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
index 79461ffc7276e..18f7c1f7e760f 100644
--- a/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
+++ b/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
@@ -47,11 +47,8 @@ Output::
 
 //// [/home/src/projects/project/main.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var data_json_1 = __importDefault(require("./data.json"));
+var data_json_1 = require("./data.json");
 var x = data_json_1.default;
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js
index 318fa417eb2fb..a69c0b04ddc37 100644
--- a/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js
+++ b/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js
@@ -56,12 +56,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node
 1 export const y: 10 = 20;
                ~
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -218,7 +213,7 @@ CreatingProgramWith::
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},"-10726455937-export const x = 10;",{"version":"-13729955264-export const y = 10;","signature":"-7152472870-export declare const y = 10;\n"}],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true},"affectedFilesPendingEmit":[2,3],"emitSignatures":[2,3],"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-10726455937-export const x = 10;","signature":"-6821242887-export declare const x = 10;\n"},{"version":"-13729955264-export const y = 10;","signature":"-7152472870-export declare const y = 10;\n"}],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true},"affectedFilesPendingEmit":[[2,1],[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -238,8 +233,12 @@ CreatingProgramWith::
       "affectsGlobalScope": true
     },
     "./a.ts": {
+      "original": {
+        "version": "-10726455937-export const x = 10;",
+        "signature": "-6821242887-export declare const x = 10;\n"
+      },
       "version": "-10726455937-export const x = 10;",
-      "signature": "-10726455937-export const x = 10;"
+      "signature": "-6821242887-export declare const x = 10;\n"
     },
     "./b.ts": {
       "original": {
@@ -267,23 +266,33 @@ CreatingProgramWith::
   },
   "affectedFilesPendingEmit": [
     [
-      "./a.ts",
-      "Js | Dts"
+      [
+        "./a.ts",
+        1
+      ],
+      "Js"
     ],
     [
-      "./b.ts",
-      "Js | Dts"
+      [
+        "./b.ts",
+        1
+      ],
+      "Js"
     ]
   ],
-  "emitSignatures": [
-    "./a.ts",
-    "./b.ts"
-  ],
-  "errors": true,
+  "latestChangedDtsFile": "./b.d.ts",
   "version": "FakeTSVersion",
-  "size": 843
+  "size": 917
 }
 
+//// [/user/username/projects/myproject/a.d.ts]
+export declare const x = 10;
+
+
+//// [/user/username/projects/myproject/b.d.ts]
+export declare const y = 10;
+
+
 
 
 Program root files: [
@@ -325,6 +334,81 @@ exitCode:: ExitStatus.undefined
 Change:: Emit all files
 
 Input::
+//// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-10726455937-export const x = 10;","signature":"-6821242887-export declare const x = 10;\n"},{"version":"-13729955264-export const y = 10;","signature":"-7152472870-export declare const y = 10;\n"}],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true},"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+
+//// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./a.ts",
+    "./b.ts"
+  ],
+  "fileInfos": {
+    "../../../../home/src/tslibs/ts/lib/lib.d.ts": {
+      "original": {
+        "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "affectsGlobalScope": true
+      },
+      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "signature": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "affectsGlobalScope": true
+    },
+    "./a.ts": {
+      "original": {
+        "version": "-10726455937-export const x = 10;",
+        "signature": "-6821242887-export declare const x = 10;\n"
+      },
+      "version": "-10726455937-export const x = 10;",
+      "signature": "-6821242887-export declare const x = 10;\n"
+    },
+    "./b.ts": {
+      "original": {
+        "version": "-13729955264-export const y = 10;",
+        "signature": "-7152472870-export declare const y = 10;\n"
+      },
+      "version": "-13729955264-export const y = 10;",
+      "signature": "-7152472870-export declare const y = 10;\n"
+    }
+  },
+  "root": [
+    [
+      2,
+      "./a.ts"
+    ],
+    [
+      3,
+      "./b.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 2,
+    "noEmitOnError": true
+  },
+  "latestChangedDtsFile": "./b.d.ts",
+  "version": "FakeTSVersion",
+  "size": 876
+}
+
+//// [/user/username/projects/myproject/a.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = 10;
+});
+
+
+//// [/user/username/projects/myproject/b.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.y = void 0;
+    exports.y = 10;
+});
+
+
 
 
 Program: Same as old program
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js
index 5cc53012604a4..add699de17580 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-emit-builder.js
@@ -35,17 +35,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -74,13 +69,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../../../home/src/tslibs/ts/lib/lib.d.ts",
-    "./myproject/main.ts",
-    "./myproject/other.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 718
+  "size": 711
 }
 
 
@@ -121,7 +115,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
@@ -132,17 +129,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -171,24 +163,10 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/main.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/other.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 913
+  "size": 876
 }
 
 //// [/user/username/projects/outFile.js]
@@ -272,7 +250,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -311,17 +289,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -350,13 +323,14 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./myproject/main.ts"
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
+  ],
   "version": "FakeTSVersion",
-  "size": 912
+  "size": 909
 }
 
 
@@ -397,7 +371,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
@@ -408,17 +385,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -447,24 +419,10 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/main.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/other.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 892
 }
 
 //// [/user/username/projects/outFile.js]
@@ -540,7 +498,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -580,17 +538,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16105752451-export const x = 10;\n// SomeComment\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16105752451-export const x = 10;\n// SomeComment\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -619,24 +572,10 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/main.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/other.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 945
+  "size": 908
 }
 
 //// [/user/username/projects/outFile.js]
@@ -693,7 +632,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js
index 289174f4c4713..8fba68ffe4da2 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmit-with-composite-with-semantic-builder.js
@@ -35,17 +35,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[1,2,3],"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -74,13 +69,12 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "../../../home/src/tslibs/ts/lib/lib.d.ts",
-    "./myproject/main.ts",
-    "./myproject/other.ts"
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
   ],
   "version": "FakeTSVersion",
-  "size": 718
+  "size": 711
 }
 
 
@@ -121,7 +115,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
@@ -139,17 +136,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -178,24 +170,10 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/main.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/other.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 913
+  "size": 876
 }
 
 //// [/user/username/projects/outFile.js]
@@ -279,7 +257,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -325,17 +303,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":17,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -364,13 +337,14 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./myproject/main.ts"
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
+  "pendingEmit": [
+    "Js | DtsEmit",
+    17
+  ],
   "version": "FakeTSVersion",
-  "size": 912
+  "size": 909
 }
 
 
@@ -411,7 +385,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
@@ -429,17 +406,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-14918944530-export const x = 10;\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -468,24 +440,10 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/main.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./myproject/other.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 892
 }
 
 //// [/user/username/projects/outFile.js]
@@ -561,7 +519,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -608,17 +566,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16105752451-export const x = 10;\n// SomeComment\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"changeFileSet":[2],"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-16105752451-export const x = 10;\n// SomeComment\n// SomeComment","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -647,13 +600,10 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "changeFileSet": [
-    "./myproject/main.ts"
-  ],
   "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
   "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 928
+  "size": 908
 }
 
 //// [/user/username/projects/outFile.js]
@@ -710,7 +660,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js
index 1b0b9d5cade2f..7226b63bc6ed8 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-emit-builder.js
@@ -41,12 +41,7 @@ Output::
 1 export const x: string = 10;
                ~
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -188,12 +183,7 @@ Output::
 1 export const x: string = 10;
                ~
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -329,17 +319,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -369,15 +354,36 @@ Output::
     "noEmitOnError": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
+  "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 749
+  "size": 897
 }
 
+//// [/user/username/projects/outFile.js]
+define("main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = 10;
+});
+define("other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.y = void 0;
+    exports.y = 10;
+});
+
+
+//// [/user/username/projects/outFile.d.ts]
+declare module "main" {
+    export const x = 10;
+}
+declare module "other" {
+    export const y = 10;
+}
+
+
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types: *new*
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js
index 00ca73cd83108..d669686b0328e 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/noEmitOnError-with-composite-with-semantic-builder.js
@@ -41,12 +41,7 @@ Output::
 1 export const x: string = 10;
                ~
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -195,12 +190,7 @@ Output::
 1 export const x: string = 10;
                ~
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -343,17 +333,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -383,15 +368,36 @@ Output::
     "noEmitOnError": true,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | Dts",
-    false
-  ],
-  "errors": true,
+  "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
   "version": "FakeTSVersion",
-  "size": 749
+  "size": 897
 }
 
+//// [/user/username/projects/outFile.js]
+define("main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = 10;
+});
+define("other", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.y = void 0;
+    exports.y = 10;
+});
+
+
+//// [/user/username/projects/outFile.d.ts]
+declare module "main" {
+    export const x = 10;
+}
+declare module "other" {
+    export const y = 10;
+}
+
+
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types: *new*
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js b/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
index b90e4923c2e5d..cb4015ae1c4a6 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
@@ -41,12 +41,7 @@ Output::
 1 export const x: string = 10;
                ~
 
-tsconfig.json:6:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-6     "module": "amd"
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -186,7 +181,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":1,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -216,15 +211,25 @@ Output::
     "noEmitOnError": true,
     "outFile": "./outFile.js"
   },
+  "outSignature": "3483479585-declare module \"main\" {\n    export const x = 10;\n}\ndeclare module \"other\" {\n    export const y = 10;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
   "pendingEmit": [
-    "Js | Dts",
-    false
+    "Js",
+    1
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 749
+  "size": 913
 }
 
+//// [/user/username/projects/outFile.d.ts]
+declare module "main" {
+    export const x = 10;
+}
+declare module "other" {
+    export const y = 10;
+}
+
+
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types: *new*
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index b0a16703507c7..97d5b1ac17069 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -29,9 +29,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -72,7 +70,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
@@ -98,9 +99,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -122,7 +121,10 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+/user/username/projects/myproject/other.ts
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js
index c793ba7e4951f..a8bde222cbce4 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js
@@ -57,12 +57,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node
 1 export const y: 10 = 20;
                ~
 
-tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-5     "module": "amd",
-                ~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -194,7 +189,7 @@ CreatingProgramWith::
 
 
 //// [/user/username/projects/myproject/outFile.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"pendingEmit":false,"errors":true,"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"-4206946595-declare module \"a\" {\n    export const x = 10;\n}\ndeclare module \"b\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","pendingEmit":1,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -224,15 +219,25 @@ CreatingProgramWith::
     "noEmitOnError": true,
     "outFile": "./outFile.js"
   },
+  "outSignature": "-4206946595-declare module \"a\" {\n    export const x = 10;\n}\ndeclare module \"b\" {\n    export const y = 10;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
   "pendingEmit": [
-    "Js | Dts",
-    false
+    "Js",
+    1
   ],
-  "errors": true,
   "version": "FakeTSVersion",
-  "size": 725
+  "size": 883
 }
 
+//// [/user/username/projects/myproject/outFile.d.ts]
+declare module "a" {
+    export const x = 10;
+}
+declare module "b" {
+    export const y = 10;
+}
+
+
 
 
 Program root files: [
@@ -276,6 +281,58 @@ exitCode:: ExitStatus.undefined
 Change:: Emit all files
 
 Input::
+//// [/user/username/projects/myproject/outFile.tsbuildinfo]
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-10726455937-export const x = 10;","-13729955264-export const y = 10;"],"root":[2,3],"options":{"composite":true,"module":2,"noEmitOnError":true,"outFile":"./outFile.js"},"outSignature":"-4206946595-declare module \"a\" {\n    export const x = 10;\n}\ndeclare module \"b\" {\n    export const y = 10;\n}\n","latestChangedDtsFile":"./outFile.d.ts","version":"FakeTSVersion"}
+
+//// [/user/username/projects/myproject/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./a.ts",
+    "./b.ts"
+  ],
+  "fileInfos": {
+    "../../../../home/src/tslibs/ts/lib/lib.d.ts": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+    "./a.ts": "-10726455937-export const x = 10;",
+    "./b.ts": "-13729955264-export const y = 10;"
+  },
+  "root": [
+    [
+      2,
+      "./a.ts"
+    ],
+    [
+      3,
+      "./b.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 2,
+    "noEmitOnError": true,
+    "outFile": "./outFile.js"
+  },
+  "outSignature": "-4206946595-declare module \"a\" {\n    export const x = 10;\n}\ndeclare module \"b\" {\n    export const y = 10;\n}\n",
+  "latestChangedDtsFile": "./outFile.d.ts",
+  "version": "FakeTSVersion",
+  "size": 867
+}
+
+//// [/user/username/projects/myproject/outFile.js]
+define("a", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = void 0;
+    exports.x = 10;
+});
+define("b", ["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.y = void 0;
+    exports.y = 10;
+});
+
+
 
 
 Program: Same as old program
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index dcdc31bc469ac..5acd3428217ef 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -71,12 +71,7 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory
@@ -99,7 +94,7 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -148,23 +143,9 @@ declare class class2 {
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 909
+  "size": 872
 }
 
 
@@ -211,7 +192,10 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -264,15 +248,66 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
+//// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","errors":true,"version":"FakeTSVersion"}
+
+//// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "../project1/class1.d.ts",
+    "./class2.ts"
+  ],
+  "fileInfos": {
+    "../../../../../../home/src/tslibs/ts/lib/lib.d.ts": {
+      "original": {
+        "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "affectsGlobalScope": true
+      },
+      "version": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "signature": "-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "affectsGlobalScope": true
+    },
+    "../project1/class1.d.ts": {
+      "original": {
+        "version": "-3469237238-declare class class1 {}",
+        "affectsGlobalScope": true
+      },
+      "version": "-3469237238-declare class class1 {}",
+      "signature": "-3469237238-declare class class1 {}",
+      "affectsGlobalScope": true
+    },
+    "./class2.ts": {
+      "original": {
+        "version": "777969115-class class2 {}",
+        "signature": "-2684084705-declare class class2 {\n}\n",
+        "affectsGlobalScope": true
+      },
+      "version": "777969115-class class2 {}",
+      "signature": "-2684084705-declare class class2 {\n}\n",
+      "affectsGlobalScope": true
+    }
+  },
+  "root": [
+    [
+      3,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "module": 0
+  },
+  "latestChangedDtsFile": "./class2.d.ts",
+  "errors": true,
+  "version": "FakeTSVersion",
+  "size": 886
+}
+
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -320,7 +355,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
@@ -392,18 +427,13 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -462,27 +492,9 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 1013
+  "size": 974
 }
 
 
@@ -533,7 +545,11 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project1/class3.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.d.ts (used version)
@@ -606,18 +622,13 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -667,10 +678,6 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "module": 0
   },
   "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
     [
       "../project1/class1.d.ts",
       "not cached or not changed"
@@ -682,7 +689,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 909
+  "size": 907
 }
 
 
@@ -736,7 +743,9 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class1.d.ts (used version)
@@ -810,18 +819,13 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-3469237238-declare class class1 {}","affectsGlobalScope":true},{"version":"-3469165364-declare class class3 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -880,27 +884,9 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 1013
+  "size": 974
 }
 
 
@@ -951,7 +937,11 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.d.ts
+/user/username/projects/myproject/projects/project1/class3.d.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index f00fd1c4946b3..2925b3499f6a8 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -71,12 +71,7 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_mod
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Type roots
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory
@@ -99,7 +94,7 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"777933178-class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"777933178-class class1 {}","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[3],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -148,23 +143,9 @@ declare class class2 {
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 897
+  "size": 860
 }
 
 
@@ -211,7 +192,10 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -251,18 +235,13 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.ts 250 undefined Source file
-project2/tsconfig.json:3:15 - error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-3     "module": "none",
-                ~~~~~~
-
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 0 errors. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","../project1/class3.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"777933178-class class1 {}","signature":"-2723220098-declare class class1 {\n}\n","affectsGlobalScope":true},{"version":"778005052-class class3 {}","signature":"-2644949312-declare class class3 {\n}\n","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","../project1/class3.ts","./class2.ts"],"fileInfos":[{"version":"-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"777933178-class class1 {}","signature":"-2723220098-declare class class1 {\n}\n","affectsGlobalScope":true},{"version":"778005052-class class3 {}","signature":"-2644949312-declare class class3 {\n}\n","affectsGlobalScope":true},{"version":"777969115-class class2 {}","signature":"-2684084705-declare class class2 {\n}\n","affectsGlobalScope":true}],"root":[4],"options":{"composite":true,"module":0},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -323,27 +302,9 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class1.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../project1/class3.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./class2.ts",
-      "not cached or not changed"
-    ]
-  ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 1097
+  "size": 1058
 }
 
 
@@ -394,7 +355,11 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-No cached semantic diagnostics in the builder::
+Semantic diagnostics in builder refreshed for::
+/home/src/tslibs/TS/Lib/lib.d.ts
+/user/username/projects/myproject/projects/project1/class1.ts
+/user/username/projects/myproject/projects/project1/class3.ts
+/user/username/projects/myproject/projects/project2/class2.ts
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.errors.txt b/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.errors.txt
deleted file mode 100644
index 5b331ebadd7a2..0000000000000
--- a/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tsconfig.json(3,19): error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-==== tsconfig.json (1 errors) ====
-    {
-        "compilerOptions": {
-            "module": "AmD"
-                      ~~~~~
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-        }
-    }
-    
-==== other.ts (0 errors) ====
-    export default 42;
-    
-==== index.ts (0 errors) ====
-    import Answer from "./other.js";
-    const x = 10 + Answer;
-    export {
-        x
-    };
\ No newline at end of file
diff --git a/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js b/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js
index faea958ec9322..99f7a9965736b 100644
--- a/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js
+++ b/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js
@@ -17,14 +17,10 @@ define(["require", "exports"], function (require, exports) {
     exports.default = 42;
 });
 //// [index.js]
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "./other.js"], function (require, exports, other_js_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
-    other_js_1 = __importDefault(other_js_1);
     var x = 10 + other_js_1.default;
     exports.x = x;
 });
diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
index fd1ed7a41b7a9..6befa6b9292bb 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
@@ -155,22 +155,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspace/projects/b/moduleFile1.ts",
         "configFile": "/home/src/workspace/projects/b/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 4,
-              "offset": 39
-            },
-            "end": {
-              "line": 4,
-              "offset": 47
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/home/src/workspace/projects/b/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspace/projects/b/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/compileOnSave/emit-in-project-with-dts-emit.js b/tests/baselines/reference/tsserver/compileOnSave/emit-in-project-with-dts-emit.js
index 0690451a25b92..a5455fc2c2aaf 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/emit-in-project-with-dts-emit.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/emit-in-project-with-dts-emit.js
@@ -166,22 +166,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/file1.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js b/tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js
index 349f99e764652..8201be284b3f2 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js
@@ -166,22 +166,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/file1.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js b/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
index 2a7d4686ed7d6..458cdacd4f817 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
@@ -152,22 +152,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/solution/projects/project/file1.ts",
         "configFile": "/users/username/solution/projects/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 6,
-              "offset": 15
-            },
-            "end": {
-              "line": 6,
-              "offset": 20
-            },
-            "text": "Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/users/username/solution/projects/project/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/solution/projects/project/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js
index 458476870bc5a..4c3c0611eb6de 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -531,22 +531,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/a/b/tsconfig.json",
         "configFile": "/user/username/projects/project/a/b/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 25
-            },
-            "end": {
-              "line": 3,
-              "offset": 34
-            },
-            "text": "Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/project/a/b/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index e0d888ed9e83f..d1220d6aadba5 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -141,22 +141,7 @@ Info seq  [hh:mm:ss:mss] event:
       "event": "CustomHandler::configFileDiag",
       "body": {
         "configFileName": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/users/username/projects/project/tsconfig.json"
-          }
-        ],
+        "diagnostics": [],
         "triggerFile": "/users/username/projects/project/file1Consumer1.ts"
       }
     }
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index 00e07b7023cf2..4abb9f3bf488a 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -145,22 +145,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/project/file1Consumer1.ts",
         "configFile": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/users/username/projects/project/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index f46dd9c93fd23..c3532faafc4d1 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -145,22 +145,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/project/file1Consumer1.ts",
         "configFile": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/users/username/projects/project/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/project/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js
index f2064f9ecbe4e..5998f27a57a82 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js
index 8f3f4a459ffc4..f6fa5d9bbeb42 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-and-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js
index 33ad72ed0d7ca..e1fbb00a155aa 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk-with-target-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 78e2373e73353..746c3d3535da5 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js
index 19be3c19c5ac1..9c27e27f63b9c 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js
index 3743c940b5812..333cb69a47588 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-and-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js
index f66efe02c9425..8c83c798b4fc0 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not-with-target-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index 62ee167cd3ee3..cfb02e064bb2e 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js
index bdf42c352f2c1..17bb2628edd33 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js
index d306783327b8c..812474512745e 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-and-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js
index 7516c616f5e1f..f6a2b6d29cca6 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different-with-target-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index ecce46211a5a8..b0b0be2fe8474 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js
index d2b72c17b3b26..bf2ee3f258740 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js
index c71e5a72b17ba..53f6d4fc7b63a 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-and-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js
index b614e6e5adf0d..904831190df9b 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk-with-target-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index 83f20dd96586e..2c81a3daae88e 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js
index 80994ab9a2cfd..c435515f3969a 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js
index c954c89aad037..c9638420f20b4 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-and-link-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js
index 84d53553177ea..51e587c83ada2 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not-with-target-open.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index f9e53a60573c5..6553078bca631 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -167,22 +167,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 5,
-              "offset": 15
-            },
-            "end": {
-              "line": 5,
-              "offset": 23
-            },
-            "text": "Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
index 4cc1786037d63..adff34f7c212a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
@@ -509,10 +509,8 @@ Info seq  [hh:mm:ss:mss] Same program as before
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
 Info seq  [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 2 module specifiers, plus 0 ambient and 0 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 2 from cache
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -527,7 +525,7 @@ Info seq  [hh:mm:ss:mss] response:
         "updateGraphDurationMs": *
       },
       "body": {
-        "flags": 9,
+        "flags": 1,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -939,19 +937,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "class",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "common-dependency",
+            "source": "/home/src/workspaces/project/node_modules/common-dependency/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "common-dependency",
-                "kind": "text"
-              }
-            ],
             "isPackageJsonImport": true,
             "data": {
               "exportName": "CommonDependency",
               "exportMapKey": "16 * CommonDependency ",
-              "moduleSpecifier": "common-dependency",
               "fileName": "/home/src/workspaces/project/node_modules/common-dependency/index.d.ts",
               "isPackageJsonImport": true
             }
@@ -961,19 +952,12 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "class",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "package-dependency",
+            "source": "/home/src/workspaces/project/node_modules/package-dependency/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "package-dependency",
-                "kind": "text"
-              }
-            ],
             "isPackageJsonImport": true,
             "data": {
               "exportName": "PackageDependency",
               "exportMapKey": "17 * PackageDependency ",
-              "moduleSpecifier": "package-dependency",
               "fileName": "/home/src/workspaces/project/node_modules/package-dependency/index.d.ts",
               "isPackageJsonImport": true
             }
@@ -987,60 +971,6 @@ Info seq  [hh:mm:ss:mss] response:
       }
     }
 After Request
-watchedFiles::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.decorators.d.ts:
-  {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts:
-  {"pollingInterval":500}
-/home/src/tslibs/TS/Lib/lib.esnext.full.d.ts:
-  {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/common-dependency/index.d.ts:
-  {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/common-dependency/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/common-dependency/package.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/common-dependency/tsconfig.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/package-dependency/index.d.ts:
-  {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/package-dependency/package.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/tsconfig.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/package.json:
-  {"pollingInterval":250}
-/home/src/workspaces/project/packages/a/package.json:
-  {"pollingInterval":250}
-/home/src/workspaces/project/packages/a/tsconfig.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-watchedDirectoriesRecursive::
-/home/src/workspaces/node_modules/@types:
-  {}
-  {}
-/home/src/workspaces/project/node_modules: *new*
-  {}
-/home/src/workspaces/project/node_modules/@types:
-  {}
-  {}
-/home/src/workspaces/project/node_modules/common-dependency/node_modules/@types:
-  {}
-/home/src/workspaces/project/node_modules/node_modules/@types:
-  {}
-/home/src/workspaces/project/packages/a:
-  {}
-/home/src/workspaces/project/packages/a/node_modules/@types:
-  {}
-/home/src/workspaces/project/packages/node_modules/@types:
-  {}
-
 Projects::
 /dev/null/autoImportProviderProject1* (AutoImportProvider) *changed*
     projectStateVersion: 2
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
index bd405d9cf0e5b..5de5df8128a8e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
@@ -3588,8 +3588,12 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "completionInfo"
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/node_modules 1 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/workspaces/project 0 undefined Project: /home/src/workspaces/project/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/home/src/workspaces/project/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (5)
@@ -4227,6 +4231,12 @@ watchedFiles::
 /home/src/workspaces/project/tsconfig.json:
   {"pollingInterval":2000}
 
+watchedDirectories::
+/home/src/workspaces: *new*
+  {}
+/home/src/workspaces/project: *new*
+  {}
+
 watchedDirectoriesRecursive::
 /home/src/workspaces/node_modules: *new*
   {}
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
index d4a5624f2865d..60c3f35d8f422 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
@@ -390,8 +390,8 @@ Info seq  [hh:mm:ss:mss] getCompletionData: Is inside comment: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
 Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
-Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 1 module specifiers, plus 0 ambient and 0 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 1 from cache
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -403,7 +403,7 @@ Info seq  [hh:mm:ss:mss] response:
       "request_seq": 3,
       "success": true,
       "body": {
-        "flags": 9,
+        "flags": 1,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -1055,18 +1055,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "const",
             "kindModifiers": "",
             "sortText": "16",
-            "source": "./undefinedAlias",
+            "source": "/home/src/workspaces/project/undefinedAlias",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "./undefinedAlias",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "export=",
               "exportMapKey": "1 * x ",
-              "moduleSpecifier": "./undefinedAlias",
               "fileName": "/home/src/workspaces/project/undefinedAlias.ts"
             }
           },
@@ -1136,7 +1129,7 @@ Info seq  [hh:mm:ss:mss] getCompletionData: Is inside comment: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache hit
 Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 1 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -1800,18 +1793,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "const",
             "kindModifiers": "",
             "sortText": "16",
-            "source": "./undefinedAlias",
+            "source": "/home/src/workspaces/project/undefinedAlias",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "./undefinedAlias",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "export=",
               "exportMapKey": "1 * x ",
-              "moduleSpecifier": "./undefinedAlias",
               "fileName": "/home/src/workspaces/project/undefinedAlias.ts"
             }
           },
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
index 3323b4222a6b6..be9aec726da33 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
@@ -447,7 +447,7 @@ Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: isCompletionListBlocker: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
 Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
 Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 2 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -1121,18 +1121,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useBlah",
               "exportMapKey": "7 * useBlah ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -1141,18 +1134,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useState",
               "exportMapKey": "8 * useState ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -1223,7 +1209,7 @@ Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: isCompletionListBlocker: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache hit
 Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 2 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -1897,18 +1883,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useBlah",
               "exportMapKey": "7 * useBlah ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -1917,18 +1896,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useState",
               "exportMapKey": "8 * useState ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -4462,7 +4434,7 @@ Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: isCompletionListBlocker: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache miss or empty; calculating new results
 Info seq  [hh:mm:ss:mss] getExportInfoMap: done in * ms
 Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 2 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -5139,18 +5111,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useState",
               "exportMapKey": "8 * useState ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -5159,18 +5124,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useYes",
               "exportMapKey": "6 * useYes ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -5242,7 +5200,7 @@ Info seq  [hh:mm:ss:mss] getCompletionData: Get previous token: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: isCompletionListBlocker: *
 Info seq  [hh:mm:ss:mss] getExportInfoMap: cache hit
 Info seq  [hh:mm:ss:mss] collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 2 from cache
-Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is incomplete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -5916,18 +5874,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useState",
               "exportMapKey": "8 * useState ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
@@ -5936,18 +5887,11 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "react",
+            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
             "hasAction": true,
-            "sourceDisplay": [
-              {
-                "text": "react",
-                "kind": "text"
-              }
-            ],
             "data": {
               "exportName": "useYes",
               "exportMapKey": "6 * useYes ",
-              "moduleSpecifier": "react",
               "fileName": "/home/src/workspaces/project/node_modules/@types/react/index.d.ts"
             }
           },
diff --git a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
index 69968a6de6302..8c90e50c1c4c6 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
@@ -229,13 +229,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/a/index.ts",
         "configFile": "/home/src/workspaces/project/a/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/a/tsconfig.json ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
@@ -600,13 +594,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/b/index.ts",
         "configFile": "/home/src/workspaces/project/b/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/b/index.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/b/tsconfig.json
@@ -666,13 +654,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/project/c/index.ts",
         "configFile": "/home/src/workspaces/project/c/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/c/index.ts ProjectRootPath: undefined:: Result: /home/src/workspaces/project/c/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js
index c5bf19afffc7e..53c954941ed87 100644
--- a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js
@@ -1108,22 +1108,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/project/tsconfig.json",
         "configFile": "/home/src/projects/project/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 1,
-              "offset": 44
-            },
-            "end": {
-              "line": 1,
-              "offset": 53
-            },
-            "text": "Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/home/src/projects/project/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js b/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js
index c4270b4c9dc77..7a73935371118 100644
--- a/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js
+++ b/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js
@@ -153,20 +153,6 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/a/b/projects/myproject/bar/app.ts",
         "configFile": "/a/b/projects/myproject/tsconfig.json",
         "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/a/b/projects/myproject/tsconfig.json"
-          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js
index 466c87bc8a835..e2949d54ae266 100644
--- a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js
+++ b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js
@@ -92,7 +92,7 @@ declare namespace Hmi {
 
 
 //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-1678937917-module Hmi {\n    export class Button {\n        public static myStaticFunction() {\n        }\n    }\n}"],"root":[2],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"semanticDiagnosticsPerFile":[1,2],"outSignature":"6176297704-declare namespace Hmi {\n    class Button {\n        static myStaticFunction(): void;\n    }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","-1678937917-module Hmi {\n    export class Button {\n        public static myStaticFunction() {\n        }\n    }\n}"],"root":[2],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"6176297704-declare namespace Hmi {\n    class Button {\n        static myStaticFunction(): void;\n    }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo.readable.baseline.txt]
 {
@@ -115,20 +115,10 @@ declare namespace Hmi {
     "module": 0,
     "outFile": "./Source.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../home/src/tslibs/TS/Lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./Source.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "6176297704-declare namespace Hmi {\n    class Button {\n        static myStaticFunction(): void;\n    }\n}\n",
   "latestChangedDtsFile": "./Source.d.ts",
   "version": "FakeTSVersion",
-  "size": 913
+  "size": 878
 }
 
 //// [/user/username/projects/myproject/SiblingClass/Source.js]
@@ -154,7 +144,7 @@ declare namespace Hmi {
 
 
 //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","6176297704-declare namespace Hmi {\n    class Button {\n        static myStaticFunction(): void;\n    }\n}\n","-3370344921-module Hmi {\n    export class Sibling {\n        public mySiblingFunction() {\n        }\n    }\n}"],"root":[3],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"semanticDiagnosticsPerFile":[1,2,3],"outSignature":"-2810380820-declare namespace Hmi {\n    class Sibling {\n        mySiblingFunction(): void;\n    }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","6176297704-declare namespace Hmi {\n    class Button {\n        static myStaticFunction(): void;\n    }\n}\n","-3370344921-module Hmi {\n    export class Sibling {\n        public mySiblingFunction() {\n        }\n    }\n}"],"root":[3],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"-2810380820-declare namespace Hmi {\n    class Sibling {\n        mySiblingFunction(): void;\n    }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo.readable.baseline.txt]
 {
@@ -179,24 +169,10 @@ declare namespace Hmi {
     "module": 0,
     "outFile": "./Source.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../../../../../home/src/tslibs/TS/Lib/lib.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "../buttonClass/Source.d.ts",
-      "not cached or not changed"
-    ],
-    [
-      "./Source.ts",
-      "not cached or not changed"
-    ]
-  ],
   "outSignature": "-2810380820-declare namespace Hmi {\n    class Sibling {\n        mySiblingFunction(): void;\n    }\n}\n",
   "latestChangedDtsFile": "./Source.d.ts",
   "version": "FakeTSVersion",
-  "size": 1046
+  "size": 1009
 }
 
 
@@ -339,22 +315,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/SiblingClass/Source.ts",
         "configFile": "/user/username/projects/myproject/SiblingClass/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 8,
-              "offset": 3
-            },
-            "end": {
-              "line": 8,
-              "offset": 20
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/SiblingClass/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/SiblingClass/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/finding-local-reference-doesnt-load-ancestor-sibling-projects.js b/tests/baselines/reference/tsserver/projectReferences/finding-local-reference-doesnt-load-ancestor-sibling-projects.js
index 4433210b6254e..5b0dfc99be6a6 100644
--- a/tests/baselines/reference/tsserver/projectReferences/finding-local-reference-doesnt-load-ancestor-sibling-projects.js
+++ b/tests/baselines/reference/tsserver/projectReferences/finding-local-reference-doesnt-load-ancestor-sibling-projects.js
@@ -201,22 +201,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/solution/compiler/program.ts",
         "configFile": "/user/username/projects/solution/compiler/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 4,
-              "offset": 15
-            },
-            "end": {
-              "line": 4,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/solution/compiler/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/solution/compiler/tsconfig.json ProjectRootPath: undefined:: Result: /user/username/projects/solution/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/finding-references-in-overlapping-projects.js b/tests/baselines/reference/tsserver/projectReferences/finding-references-in-overlapping-projects.js
index bc07ea07522ee..afdeaea41b930 100644
--- a/tests/baselines/reference/tsserver/projectReferences/finding-references-in-overlapping-projects.js
+++ b/tests/baselines/reference/tsserver/projectReferences/finding-references-in-overlapping-projects.js
@@ -451,22 +451,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/solution/a/index.ts",
         "configFile": "/user/username/projects/solution/a/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 4,
-              "offset": 15
-            },
-            "end": {
-              "line": 4,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/solution/a/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/solution/a/index.ts ProjectRootPath: undefined:: Result: /user/username/projects/solution/a/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js
index a84627cb3351c..2e00605699bbe 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js
@@ -195,22 +195,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/class2.ts",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -344,20 +329,6 @@ Info seq  [hh:mm:ss:mss] event:
                 "code": 1413
               }
             ]
-          },
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
           }
         ]
       }
@@ -514,22 +485,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -721,20 +677,6 @@ Info seq  [hh:mm:ss:mss] event:
                 "code": 1413
               }
             ]
-          },
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
           }
         ]
       }
@@ -852,22 +794,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js
index 78fd941646495..0c76d96dacb60 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js
@@ -192,22 +192,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/class2.ts",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js
index 385f50ac0a8d2..31e0b763e096f 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js
@@ -195,22 +195,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/class2.ts",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -386,22 +371,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project1/class1.ts",
         "configFile": "/user/username/projects/myproject/projects/project1/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project1/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project1/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -561,20 +531,6 @@ Info seq  [hh:mm:ss:mss] event:
                 "code": 1413
               }
             ]
-          },
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
           }
         ]
       }
@@ -802,22 +758,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -1050,20 +991,6 @@ Info seq  [hh:mm:ss:mss] event:
                 "code": 1413
               }
             ]
-          },
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
           }
         ]
       }
@@ -1209,22 +1136,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js
index 63802dd273a40..ece3e0aeeffb4 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js
@@ -192,22 +192,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project2/class2.ts",
         "configFile": "/user/username/projects/myproject/projects/project2/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project2/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -384,22 +369,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/projects/project1/class1.ts",
         "configFile": "/user/username/projects/myproject/projects/project1/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/projects/project1/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project1/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/with-disableSolutionSearching-solution-and-siblings-are-not-loaded.js b/tests/baselines/reference/tsserver/projectReferences/with-disableSolutionSearching-solution-and-siblings-are-not-loaded.js
index fe81ab88f9aab..97783004bb8cd 100644
--- a/tests/baselines/reference/tsserver/projectReferences/with-disableSolutionSearching-solution-and-siblings-are-not-loaded.js
+++ b/tests/baselines/reference/tsserver/projectReferences/with-disableSolutionSearching-solution-and-siblings-are-not-loaded.js
@@ -204,22 +204,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/solution/compiler/program.ts",
         "configFile": "/user/username/projects/solution/compiler/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 4,
-              "offset": 15
-            },
-            "end": {
-              "line": 4,
-              "offset": 21
-            },
-            "text": "Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/solution/compiler/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/solution/compiler/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
index 746910b4f5cef..a4812ae1a698a 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
@@ -210,34 +210,6 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts",
         "configFile": "/user/username/projects/myproject/src/tsconfig.json",
         "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 20
-            },
-            "text": "Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
-          },
-          {
-            "start": {
-              "line": 4,
-              "offset": 25
-            },
-            "end": {
-              "line": 4,
-              "offset": 34
-            },
-            "text": "Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
-          },
           {
             "start": {
               "line": 7,
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
index b02e1aa0a682e..36f462849103f 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
@@ -222,34 +222,6 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts",
         "configFile": "/user/username/projects/myproject/src/tsconfig.json",
         "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 20
-            },
-            "text": "Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
-          },
-          {
-            "start": {
-              "line": 4,
-              "offset": 25
-            },
-            "end": {
-              "line": 4,
-              "offset": 34
-            },
-            "text": "Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
-          },
           {
             "start": {
               "line": 7,
diff --git a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
index 65a393e5e7e32..2b00c8170f808 100644
--- a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
+++ b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
@@ -214,22 +214,7 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/test/test.ts",
         "configFile": "/user/username/projects/myproject/test/tsconfig.json",
-        "diagnostics": [
-          {
-            "start": {
-              "line": 3,
-              "offset": 15
-            },
-            "end": {
-              "line": 3,
-              "offset": 20
-            },
-            "text": "Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
-            "code": 5107,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/test/tsconfig.json"
-          }
-        ]
+        "diagnostics": []
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/test/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js b/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js
index 26cfd291c5fa5..6dee485cdd88a 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/local-module-should-not-be-picked-up.js
@@ -345,7 +345,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 3,
               "offset": 35
             },
-            "text": "Argument for '--moduleResolution' option must be: 'node16', 'nodenext', 'bundler'.",
+            "text": "Argument for '--moduleResolution' option must be: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.",
             "code": 6046,
             "category": "error",
             "fileName": "/user/username/projects/project/jsconfig.json"
diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js
index 584d57b65dbf3..68085c199f88d 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -31,20 +31,22 @@ export class MyComponent {
 
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MyComponent = void 0;
-var MyComponent = /** @class */ (function () {
-    function MyComponent() {
-    }
-    MyComponent.prototype.render = function () {
-    };
-    return MyComponent;
-}());
-exports.MyComponent = MyComponent;
-// Should be an error
-<MyComponent bar='world'/>;
-// Should be OK
-<MyComponent bar={true}/>;
-// Should be ok
-<MyComponent data-bar='hello'/>;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MyComponent = void 0;
+    var MyComponent = /** @class */ (function () {
+        function MyComponent() {
+        }
+        MyComponent.prototype.render = function () {
+        };
+        return MyComponent;
+    }());
+    exports.MyComponent = MyComponent;
+    // Should be an error
+    <MyComponent bar='world'/>;
+    // Should be OK
+    <MyComponent bar={true}/>;
+    // Should be ok
+    <MyComponent data-bar='hello'/>;
+});
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index 7430199b44075..09a71abb9ec68 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -27,16 +27,18 @@ export class MyComponent {
 
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MyComponent = void 0;
-var MyComponent = /** @class */ (function () {
-    function MyComponent() {
-    }
-    MyComponent.prototype.render = function () {
-    };
-    return MyComponent;
-}());
-exports.MyComponent = MyComponent;
-<MyComponent foo="bar"/>; // ok  
-<MyComponent foo={0}/>; // should be an error
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MyComponent = void 0;
+    var MyComponent = /** @class */ (function () {
+        function MyComponent() {
+        }
+        MyComponent.prototype.render = function () {
+        };
+        return MyComponent;
+    }());
+    exports.MyComponent = MyComponent;
+    <MyComponent foo="bar"/>; // ok  
+    <MyComponent foo={0}/>; // should be an error
+});
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
index 8e85e0774682e..18578482e1251 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
@@ -27,83 +27,17 @@ export const result = <MyComponent x="yes" y={{
 
 //// [my-component.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = MyComponent;
-var React = __importStar(require("react"));
+var React = require("react");
 function MyComponent(_props) {
     return React.createElement("span", null, "my component");
 }
 //// [file1.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.result = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var my_component_1 = require("./my-component");
 exports.result = React.createElement(my_component_1.MyComponent, { x: "yes", y: {
         value: 42
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index 702c5799fd1fc..4063c7376806a 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -29,9 +29,6 @@ var SomeClass = /** @class */ (function () {
 exports.default = SomeClass;
 //// [b.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 var a = a_1.default.E.one;
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index 2d0bb29e9561b..f7dde3b13481b 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -35,42 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Text = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var Text = /** @class */ (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index 52bdfa286c0b5..0058be3018a1e 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -35,42 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Text = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var Text = /** @class */ (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index 7137ab1455872..957ab31132b2e 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -35,42 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Text = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var Text = /** @class */ (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index 3040b5396d6fe..9d41b24cd67ef 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -35,42 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Text = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var Text = /** @class */ (function (_super) {
     __extends(Text, _super);
     function Text() {
diff --git a/tests/baselines/reference/tsxElementResolution17.errors.txt b/tests/baselines/reference/tsxElementResolution17.errors.txt
deleted file mode 100644
index a8d7b896a9ba4..0000000000000
--- a/tests/baselines/reference/tsxElementResolution17.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== consumer.tsx (0 errors) ====
-    ///<reference path="file.tsx" />
-    // Should keep s1 and elide s2
-    import s1 = require('elements1');
-    import s2 = require('elements2');
-    <s1.MyElement />;
-    
-==== file.tsx (0 errors) ====
-    declare namespace JSX {
-    	interface Element { }
-    	interface IntrinsicElements { }
-    }
-    
-    declare module 'elements1' {
-    	class MyElement {
-    
-    	}
-    }
-    
-    declare module 'elements2' {
-    	class MyElement {
-    
-    	}
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index 68ad010786870..cbbd551ee26a4 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -20,52 +20,20 @@ import {MyClass} from './file1';
 
 
 //// [file1.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MyClass = void 0;
-var MyClass = /** @class */ (function () {
-    function MyClass() {
-    }
-    return MyClass;
-}());
-exports.MyClass = MyClass;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MyClass = void 0;
+    var MyClass = /** @class */ (function () {
+        function MyClass() {
+        }
+        return MyClass;
+    }());
+    exports.MyClass = MyClass;
+});
 //// [file2.js]
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    React.createElement(file1_1.MyClass, null);
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-// Should not elide React import
-var React = __importStar(require("react"));
-var file1_1 = require("./file1");
-React.createElement(file1_1.MyClass, null);
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index b15f67bd53c7e..13f08026fcb7c 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -47,42 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Button = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 var Button = /** @class */ (function (_super) {
     __extends(Button, _super);
     function Button() {
@@ -111,42 +78,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.App = void 0;
-var React = __importStar(require("react"));
+var React = require("react");
 // Should see var button_1 = require('./button') here
 var button_1 = require("./button");
 var App = /** @class */ (function (_super) {
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 4f0646a95c915..02277011f9ac0 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -29,11 +29,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var mod_1 = __importDefault(require("mod"));
+var mod_1 = require("mod");
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, { handler: mod_1.default });
 // Should see mod_1['default'] in emit here
diff --git a/tests/baselines/reference/tsxFragmentChildrenCheck.js b/tests/baselines/reference/tsxFragmentChildrenCheck.js
index e54241f514295..45b806531c1cb 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -52,41 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var React = __importStar(require("react"));
+var React = require("react");
 var my_component_1 = require("./my-component");
 var MY_STRING = 'Ceci n\'est pas une string.';
 var MY_CLASSNAME = 'jeclass';
diff --git a/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js b/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js
index e640d619b40f0..3392e67714724 100644
--- a/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js
+++ b/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js
@@ -12,42 +12,9 @@ function testComponent(props) {
 
 //// [tsxNoTypeAnnotatedSFC.jsx]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 // not _actually_ making react available in this test to regression test #22948
-var React = __importStar(require("react"));
+var React = require("react");
 var Test123 = function () { return <div />; };
 function testComponent(props) {
     return <Test123 {...props}/>;
diff --git a/tests/baselines/reference/tsxPreserveEmit1.errors.txt b/tests/baselines/reference/tsxPreserveEmit1.errors.txt
deleted file mode 100644
index cad606d8c3434..0000000000000
--- a/tests/baselines/reference/tsxPreserveEmit1.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.tsx (0 errors) ====
-    // Should emit 'react-router' in the AMD dependency list
-    import React = require('react');
-    import ReactRouter = require('react-router');
-    
-    import Route = ReactRouter.Route;
-    
-    var routes1 = <Route />;
-    
-    namespace M {
-    	export var X: any;
-    }
-    namespace M {
-    	// Should emit 'M.X' in both opening and closing tags
-    	var y = <X></X>;
-    }
-    
-==== react.d.ts (0 errors) ====
-    declare module 'react' {
-    	var x: any;
-    	export = x;
-    }
-    
-    declare namespace ReactRouter {
-    	var Route: any;
-    	interface Thing { }
-    }
-    declare module 'react-router' {
-    	export = ReactRouter;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxPreserveEmit1.types b/tests/baselines/reference/tsxPreserveEmit1.types
index 878742f74c95a..f817d1a63567a 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.types
+++ b/tests/baselines/reference/tsxPreserveEmit1.types
@@ -19,12 +19,9 @@ import Route = ReactRouter.Route;
 >      : ^^^
 
 var routes1 = <Route />;
->routes1 : any
->        : ^^^
-><Route /> : any
->          : ^^^
+>routes1 : error
+><Route /> : error
 >Route : any
->      : ^^^
 
 namespace M {
 >M : typeof M
@@ -32,7 +29,6 @@ namespace M {
 
 	export var X: any;
 >X : any
->  : ^^^
 }
 namespace M {
 >M : typeof M
@@ -40,14 +36,10 @@ namespace M {
 
 	// Should emit 'M.X' in both opening and closing tags
 	var y = <X></X>;
->y : any
->  : ^^^
-><X></X> : any
->        : ^^^
+>y : error
+><X></X> : error
 >X : any
->  : ^^^
 >X : any
->  : ^^^
 }
 
 === react.d.ts ===
@@ -57,7 +49,6 @@ declare module 'react' {
 
 	var x: any;
 >x : any
->  : ^^^
 
 	export = x;
 >x : any
@@ -70,7 +61,6 @@ declare namespace ReactRouter {
 
 	var Route: any;
 >Route : any
->      : ^^^
 
 	interface Thing { }
 }
diff --git a/tests/baselines/reference/tsxPreserveEmit2.errors.txt b/tests/baselines/reference/tsxPreserveEmit2.errors.txt
deleted file mode 100644
index 352e49180d059..0000000000000
--- a/tests/baselines/reference/tsxPreserveEmit2.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== test.tsx (0 errors) ====
-    var Route: any;
-    var routes1 = <Route />;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxPreserveEmit2.types b/tests/baselines/reference/tsxPreserveEmit2.types
index 7d04b8e11f400..0a2187015afe1 100644
--- a/tests/baselines/reference/tsxPreserveEmit2.types
+++ b/tests/baselines/reference/tsxPreserveEmit2.types
@@ -3,13 +3,9 @@
 === test.tsx ===
 var Route: any;
 >Route : any
->      : ^^^
 
 var routes1 = <Route />;
->routes1 : any
->        : ^^^
-><Route /> : any
->          : ^^^
+>routes1 : error
+><Route /> : error
 >Route : any
->      : ^^^
 
diff --git a/tests/baselines/reference/tsxPreserveEmit3.errors.txt b/tests/baselines/reference/tsxPreserveEmit3.errors.txt
deleted file mode 100644
index 581d5de36c4de..0000000000000
--- a/tests/baselines/reference/tsxPreserveEmit3.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    declare namespace JSX {
-    	interface Element { }
-    	interface IntrinsicElements {
-    		[s: string]: any;
-    	}
-    }
-    
-==== test.d.ts (0 errors) ====
-    export var React;
-    
-==== react-consumer.tsx (0 errors) ====
-    // This import should be elided
-    import {React} from "./test";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxPreserveEmit3.types b/tests/baselines/reference/tsxPreserveEmit3.types
index 189769b748bf6..c167206bda122 100644
--- a/tests/baselines/reference/tsxPreserveEmit3.types
+++ b/tests/baselines/reference/tsxPreserveEmit3.types
@@ -13,7 +13,6 @@ declare namespace JSX {
 === test.d.ts ===
 export var React;
 >React : any
->      : ^^^
 
 === react-consumer.tsx ===
 // This import should be elided
diff --git a/tests/baselines/reference/tsxSfcReturnNull.errors.txt b/tests/baselines/reference/tsxSfcReturnNull.errors.txt
deleted file mode 100644
index 028a9f04c0c5a..0000000000000
--- a/tests/baselines/reference/tsxSfcReturnNull.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react');
-    
-    const Foo = (props: any) => null;
-    
-    function Greet(x: {name?: string}) {
-    	return null;
-    }
-    
-    const foo = <Foo />;
-    const G = <Greet />;
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSfcReturnNull.types b/tests/baselines/reference/tsxSfcReturnNull.types
index d5019a32d4f2e..fcbf68830c8f3 100644
--- a/tests/baselines/reference/tsxSfcReturnNull.types
+++ b/tests/baselines/reference/tsxSfcReturnNull.types
@@ -11,7 +11,6 @@ const Foo = (props: any) => null;
 >(props: any) => null : (props: any) => any
 >                     : ^     ^^   ^^^^^^^^
 >props : any
->      : ^^^
 
 function Greet(x: {name?: string}) {
 >Greet : (x: { name?: string; }) => any
diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
deleted file mode 100644
index 028a9f04c0c5a..0000000000000
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react');
-    
-    const Foo = (props: any) => null;
-    
-    function Greet(x: {name?: string}) {
-    	return null;
-    }
-    
-    const foo = <Foo />;
-    const G = <Greet />;
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
index 810d031011a76..6321ff67a485f 100644
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
@@ -11,7 +11,6 @@ const Foo = (props: any) => null;
 >(props: any) => null : (props: any) => null
 >                     : ^     ^^   ^^^^^^^^^
 >props : any
->      : ^^^
 
 function Greet(x: {name?: string}) {
 >Greet : (x: { name?: string; }) => null
diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
index 575c0bc7229e3..5599f10e07502 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
@@ -13,13 +13,14 @@ const foo = <Foo />;
 const G = <Greet />;
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var React = require("react");
-var Foo = function (props) { return undefined; };
-function Greet(x) {
-    return undefined;
-}
-// Error
-var foo = <Foo />;
-var G = <Greet />;
+define(["require", "exports", "react"], function (require, exports, React) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var Foo = function (props) { return undefined; };
+    function Greet(x) {
+        return undefined;
+    }
+    // Error
+    var foo = <Foo />;
+    var G = <Greet />;
+});
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt
index f588ee4714406..3fc0cbe69ab34 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt
@@ -1,4 +1,4 @@
-tsxSpreadChildrenInvalidType.tsx(17,12): error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed.
+tsxSpreadChildrenInvalidType.tsx(17,12): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be an array type.
 
 
@@ -21,7 +21,7 @@ tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be a
     function Todo(prop: { key: number, todo: string }) {
         return <div>{prop.key.toString() + prop.todo}</div>;
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed.
+!!! error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     }
     function TodoList({ todos }: TodoListProps) {
         return <div>
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
index 798bb8c18c256..6bb7e55a30787 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file.tsx(17,39): error TS2842: 'string' is an unused renaming of 'y1'. Did you intend to use it as a type annotation?
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (1 errors) ====
     import React = require('react')
     
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
deleted file mode 100644
index 5132e02d98719..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react')
-    declare function OneThing(): JSX.Element;
-    declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
-    
-    let obj = {
-        yy: 10,
-        yy1: "hello"
-    }
-    
-    let obj1 = {
-        yy: true
-    }
-    
-    let obj2 = {
-        yy: 500,
-        "ignore-prop": "hello"
-    }
-    
-    let defaultObj: any;
-    
-    // OK
-    const c1 = <OneThing />
-    const c2 = <OneThing {...obj}/>
-    const c3 = <OneThing {...{}} />
-    const c4 = <OneThing {...obj1} {...obj} />
-    const c5 = <OneThing {...obj1} yy={42} {...{yy1: "hi"}}/>
-    const c6 = <OneThing {...obj1} {...{yy: 10000, yy1: "true"}} />
-    const c7 = <OneThing {...defaultObj} yy {...obj} />;  // No error. should pick second overload
-    const c8 = <OneThing ignore-prop={100} />
-    const c9 = <OneThing {...{ "ignore-prop":200 }} />;
-    const c10 = <OneThing {...obj2} yy1="boo" />;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index 479db6c2f8e64..f8022330bd223 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -76,7 +76,6 @@ let obj2 = {
 
 let defaultObj: any;
 >defaultObj : any
->           : ^^^
 
 // OK
 const c1 = <OneThing />
@@ -167,7 +166,6 @@ const c7 = <OneThing {...defaultObj} yy {...obj} />;  // No error. should pick s
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >         : ^^^^^^           ^^^ ^^                            ^^^           ^^^
 >defaultObj : any
->           : ^^^
 >yy : true
 >   : ^^^^
 >obj : { yy: number; yy1: string; }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
deleted file mode 100644
index fe4eb1fcc947c..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    interface Context {
-        color: any;
-    }
-    declare function ZeroThingOrTwoThing(): JSX.Element;
-    declare function ZeroThingOrTwoThing(l: {yy: number, yy1: string}, context: Context): JSX.Element;
-    
-    let obj2: any;
-    
-    // OK
-    const two1 = <ZeroThingOrTwoThing />;
-    const two2 = <ZeroThingOrTwoThing yy={100}  yy1="hello"/>;
-    const two3 = <ZeroThingOrTwoThing {...obj2} />;  // it is just any so we allow it to pass through
-    const two4 = <ZeroThingOrTwoThing  yy={1000} {...obj2} />;  // it is just any so we allow it to pass through
-    const two5 = <ZeroThingOrTwoThing  {...obj2} yy={1000} />;  // it is just any so we allow it to pass through
-    
-    declare function ThreeThing(l: {y1: string}): JSX.Element;
-    declare function ThreeThing(l: {y2: string}): JSX.Element;
-    declare function ThreeThing(l: {yy: number, yy1: string}, context: Context, updater: any): JSX.Element;
-    
-    // OK
-    const three1 = <ThreeThing yy={99} yy1="hello world" />;
-    const three2 = <ThreeThing y2="Bye" />;
-    const three3 = <ThreeThing {...obj2} y2={10} />;  // it is just any so we allow it to pass through
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
index f2aa2b6594741..2c18fe7f97bef 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -4,7 +4,6 @@
 interface Context {
     color: any;
 >color : any
->      : ^^^
 }
 declare function ZeroThingOrTwoThing(): JSX.Element;
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
@@ -28,7 +27,6 @@ declare function ZeroThingOrTwoThing(l: {yy: number, yy1: string}, context: Cont
 
 let obj2: any;
 >obj2 : any
->     : ^^^
 
 // OK
 const two1 = <ZeroThingOrTwoThing />;
@@ -61,7 +59,6 @@ const two3 = <ZeroThingOrTwoThing {...obj2} />;  // it is just any so we allow i
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
 >                    : ^^^^^^           ^^^ ^^                            ^^       ^^       ^^^           ^^^
 >obj2 : any
->     : ^^^
 
 const two4 = <ZeroThingOrTwoThing  yy={1000} {...obj2} />;  // it is just any so we allow it to pass through
 >two4 : JSX.Element
@@ -75,7 +72,6 @@ const two4 = <ZeroThingOrTwoThing  yy={1000} {...obj2} />;  // it is just any so
 >1000 : 1000
 >     : ^^^^
 >obj2 : any
->     : ^^^
 
 const two5 = <ZeroThingOrTwoThing  {...obj2} yy={1000} />;  // it is just any so we allow it to pass through
 >two5 : JSX.Element
@@ -85,7 +81,6 @@ const two5 = <ZeroThingOrTwoThing  {...obj2} yy={1000} />;  // it is just any so
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
 >                    : ^^^^^^           ^^^ ^^                            ^^       ^^       ^^^           ^^^
 >obj2 : any
->     : ^^^
 >yy : number
 >   : ^^^^^^
 >1000 : 1000
@@ -123,7 +118,6 @@ declare function ThreeThing(l: {yy: number, yy1: string}, context: Context, upda
 >context : Context
 >        : ^^^^^^^
 >updater : any
->        : ^^^
 >JSX : any
 >    : ^^^
 
@@ -160,7 +154,6 @@ const three3 = <ThreeThing {...obj2} y2={10} />;  // it is just any so we allow
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
 >           : ^^^ ^^               ^^^           ^^^ ^^               ^^^           ^^^ ^^                            ^^       ^^       ^^       ^^   ^^^           ^^^
 >obj2 : any
->     : ^^^
 >y2 : number
 >   : ^^^^^^
 >10 : 10
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
index eb9ddba05c53e..76ce01ae5d8dc 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
@@ -40,28 +40,29 @@ const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var React = require("react");
-var obj = {
-    yy: 10,
-    yy1: "hello"
-};
-var obj2;
-// Error
-var c0 = <OneThing extraProp/>; // extra property;
-var c1 = <OneThing yy={10}/>; // missing property;
-var c2 = <OneThing {...obj} yy1/>; // type incompatible;
-var c3 = <OneThing {...obj} {...{ extra: "extra attr" }}/>; //  This is OK because all attribute are spread
-var c4 = <OneThing {...obj} y1={10000}/>; // extra property;
-var c5 = <OneThing {...obj} {...{ yy: true }}/>; // type incompatible;
-var c6 = <OneThing {...obj2} {...{ extra: "extra attr" }}/>; // Should error as there is extra attribute that doesn't match any. Current it is not
-var c7 = <OneThing {...obj2} yy/>; // Should error as there is extra attribute that doesn't match any. Current it is not
-// Error
-var d1 = <TestingOneThing extra-data/>;
-var d2 = <TestingOneThing yy="hello" direction="left"/>;
-// Error
-var e1 = <TestingOptional y1 y3="hello"/>;
-var e2 = <TestingOptional y1="hello" y2={1000} y3/>;
-var e3 = <TestingOptional y1="hello" y2={1000} children="hi"/>;
-var e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>;
+define(["require", "exports", "react"], function (require, exports, React) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var obj = {
+        yy: 10,
+        yy1: "hello"
+    };
+    var obj2;
+    // Error
+    var c0 = <OneThing extraProp/>; // extra property;
+    var c1 = <OneThing yy={10}/>; // missing property;
+    var c2 = <OneThing {...obj} yy1/>; // type incompatible;
+    var c3 = <OneThing {...obj} {...{ extra: "extra attr" }}/>; //  This is OK because all attribute are spread
+    var c4 = <OneThing {...obj} y1={10000}/>; // extra property;
+    var c5 = <OneThing {...obj} {...{ yy: true }}/>; // type incompatible;
+    var c6 = <OneThing {...obj2} {...{ extra: "extra attr" }}/>; // Should error as there is extra attribute that doesn't match any. Current it is not
+    var c7 = <OneThing {...obj2} yy/>; // Should error as there is extra attribute that doesn't match any. Current it is not
+    // Error
+    var d1 = <TestingOneThing extra-data/>;
+    var d2 = <TestingOneThing yy="hello" direction="left"/>;
+    // Error
+    var e1 = <TestingOptional y1 y3="hello"/>;
+    var e2 = <TestingOptional y1="hello" y2={1000} y3/>;
+    var e3 = <TestingOptional y1="hello" y2={1000} children="hi"/>;
+    var e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>;
+});
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
index 3d71699df61c6..7302e01113669 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
@@ -59,35 +59,36 @@ const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;
 const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MainButton = MainButton;
-var React = require("react");
-var obj0 = {
-    to: "world"
-};
-var obj1 = {
-    children: "hi",
-    to: "boo"
-};
-var obj2 = {
-    onClick: function () { }
-};
-var obj3;
-function MainButton(props) {
-    var linkProps = props;
-    if (linkProps.to) {
-        return this._buildMainLink(props);
+define(["require", "exports", "react"], function (require, exports, React) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MainButton = MainButton;
+    var obj0 = {
+        to: "world"
+    };
+    var obj1 = {
+        children: "hi",
+        to: "boo"
+    };
+    var obj2 = {
+        onClick: function () { }
+    };
+    var obj3;
+    function MainButton(props) {
+        var linkProps = props;
+        if (linkProps.to) {
+            return this._buildMainLink(props);
+        }
+        return this._buildMainButton(props);
     }
-    return this._buildMainButton(props);
-}
-// Error
-var b0 = <MainButton to='/some/path' onClick={function (e) { }}>GO</MainButton>; // extra property;
-var b1 = <MainButton onClick={function (e) { }} {...obj0}>Hello world</MainButton>; // extra property;
-var b2 = <MainButton {...{ to: "10000" }} {...obj2}/>; // extra property
-var b3 = <MainButton {...{ to: "10000" }} {...{ onClick: function (k) { } }}/>; // extra property
-var b4 = <MainButton {...obj3} to/>; // Should error because Incorrect type; but attributes are any so everything is allowed
-var b5 = <MainButton {...{ onClick: function (e) { } }} {...obj0}/>; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes
-var b6 = <MainButton {...{ onClick: function (e) { } }} children={10}/>; // incorrect type for optional attribute
-var b7 = <MainButton {...{ onClick: function (e) { } }} children="hello" className/>; // incorrect type for optional attribute
-var b8 = <MainButton data-format/>; // incorrect type for specified hyphanated name
+    // Error
+    var b0 = <MainButton to='/some/path' onClick={function (e) { }}>GO</MainButton>; // extra property;
+    var b1 = <MainButton onClick={function (e) { }} {...obj0}>Hello world</MainButton>; // extra property;
+    var b2 = <MainButton {...{ to: "10000" }} {...obj2}/>; // extra property
+    var b3 = <MainButton {...{ to: "10000" }} {...{ onClick: function (k) { } }}/>; // extra property
+    var b4 = <MainButton {...obj3} to/>; // Should error because Incorrect type; but attributes are any so everything is allowed
+    var b5 = <MainButton {...{ onClick: function (e) { } }} {...obj0}/>; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes
+    var b6 = <MainButton {...{ onClick: function (e) { } }} children={10}/>; // incorrect type for optional attribute
+    var b7 = <MainButton {...{ onClick: function (e) { } }} children="hello" className/>; // incorrect type for optional attribute
+    var b8 = <MainButton data-format/>; // incorrect type for specified hyphanated name
+});
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
index a6c1613a60863..710269fca023d 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
@@ -60,36 +60,37 @@ const b12 = <MainButton data-format="Hello world" />
 
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MainButton = MainButton;
-var React = require("react");
-var obj = {
-    children: "hi",
-    to: "boo"
-};
-var obj1;
-var obj2 = {
-    onClick: function () { }
-};
-function MainButton(props) {
-    var linkProps = props;
-    if (linkProps.to) {
-        return this._buildMainLink(props);
+define(["require", "exports", "react"], function (require, exports, React) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MainButton = MainButton;
+    var obj = {
+        children: "hi",
+        to: "boo"
+    };
+    var obj1;
+    var obj2 = {
+        onClick: function () { }
+    };
+    function MainButton(props) {
+        var linkProps = props;
+        if (linkProps.to) {
+            return this._buildMainLink(props);
+        }
+        return this._buildMainButton(props);
     }
-    return this._buildMainButton(props);
-}
-// OK
-var b0 = <MainButton to='/some/path'>GO</MainButton>;
-var b1 = <MainButton onClick={function (e) { }}>Hello world</MainButton>;
-var b2 = <MainButton {...obj}/>;
-var b3 = <MainButton {...{ to: 10000 }} {...obj}/>;
-var b4 = <MainButton {...obj1}/>; // any; just pick the first overload
-var b5 = <MainButton {...obj1} to="/to/somewhere"/>; // should pick the second overload
-var b6 = <MainButton {...obj2}/>;
-var b7 = <MainButton {...{ onClick: function () { console.log("hi"); } }}/>;
-var b8 = <MainButton {...{ onClick: function () { } }}/>; // OK; method declaration get retained (See GitHub #13365)
-var b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
-var b10 = <MainButton to='/some/path' children="hi"></MainButton>;
-var b11 = <MainButton onClick={function (e) { }} className="hello" data-format>Hello world</MainButton>;
-var b12 = <MainButton data-format="Hello world"/>;
+    // OK
+    var b0 = <MainButton to='/some/path'>GO</MainButton>;
+    var b1 = <MainButton onClick={function (e) { }}>Hello world</MainButton>;
+    var b2 = <MainButton {...obj}/>;
+    var b3 = <MainButton {...{ to: 10000 }} {...obj}/>;
+    var b4 = <MainButton {...obj1}/>; // any; just pick the first overload
+    var b5 = <MainButton {...obj1} to="/to/somewhere"/>; // should pick the second overload
+    var b6 = <MainButton {...obj2}/>;
+    var b7 = <MainButton {...{ onClick: function () { console.log("hi"); } }}/>;
+    var b8 = <MainButton {...{ onClick: function () { } }}/>; // OK; method declaration get retained (See GitHub #13365)
+    var b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
+    var b10 = <MainButton to='/some/path' children="hi"></MainButton>;
+    var b11 = <MainButton onClick={function (e) { }} className="hello" data-format>Hello world</MainButton>;
+    var b12 = <MainButton data-format="Hello world"/>;
+});
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
deleted file mode 100644
index 795f9da77205b..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react')
-    
-    interface MyComponentProp {
-        values: string;
-    }
-    
-    function MyComponent<T = MyComponentProp>(attr: T) {
-        return <div>attr.values</div>
-    }
-    
-    // OK
-    let i = <MyComponent values />;  // We infer type arguments here
-    let i1 = <MyComponent values="Hello"/>;
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
index ebc2736a796d4..022a16b79ea53 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file.tsx(13,24): error TS2322: Type 'number' is not assignable to type 'string'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (1 errors) ====
     import React = require('react')
     
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
deleted file mode 100644
index 38242626b59ab..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react');
-    
-    const Foo = (props: any) => <div/>;
-    // Should be OK
-    const foo = <Foo />;
-    
-    
-    // Should be OK
-    var MainMenu: React.StatelessComponent<{}> = (props) => (<div>
-        <h3>Main Menu</h3>
-    </div>);
-    
-    var App: React.StatelessComponent<{ children }> = ({children}) => (
-        <div >
-            <MainMenu/>
-    	</div>
-    );
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.types b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
index a3d87d3a03a0a..8cf998091eec3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
@@ -11,7 +11,6 @@ const Foo = (props: any) => <div/>;
 >(props: any) => <div/> : (props: any) => JSX.Element
 >                       : ^     ^^   ^^^^^^^^^^^^^^^^
 >props : any
->      : ^^^
 ><div/> : JSX.Element
 >       : ^^^^^^^^^^^
 >div : any
@@ -62,7 +61,6 @@ var App: React.StatelessComponent<{ children }> = ({children}) => (
 >React : any
 >      : ^^^
 >children : any
->         : ^^^
 >({children}) => (    <div >        <MainMenu/>	</div>) : ({ children }: { children: any; } & { children?: React.ReactNode; }) => JSX.Element
 >                                                       : ^            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >children : any
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
deleted file mode 100644
index bbe13314ee5bd..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react')
-    
-    declare function ComponentWithTwoAttributes<K,V>(l: {key1: K, value: V}): JSX.Element;
-    
-    // OK
-    function Baz<T,U>(key1: T, value: U) {
-        let a0 = <ComponentWithTwoAttributes key1={key1} value={value} />
-        let a1 = <ComponentWithTwoAttributes {...{key1, value: value}} key="Component" />
-    }
-    
-    declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
-    
-    // OK
-    function createLink(func: (a: number)=>void) {
-        let o = <Link func={func} />
-    }
-    
-    function createLink1(func: (a: number)=>boolean) {
-        let o = <Link func={func} />
-    }
-    
-    interface InferParamProp<T> {
-        values: Array<T>;
-        selectHandler: (selectedVal: T) => void;
-    }
-    
-    declare function InferParamComponent<T>(attr: InferParamProp<T>): JSX.Element;
-    
-    // OK
-    let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val) => { }} />;
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
index 5d0e87b0a004c..e815607ea82a4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
@@ -1,4 +1,3 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 file.tsx(8,15): error TS2322: Type 'T & { "ignore-prop": number; }' is not assignable to type 'IntrinsicAttributes & { prop: number; "ignore-prop": string; }'.
   Type 'T & { "ignore-prop": number; }' is not assignable to type '{ prop: number; "ignore-prop": string; }'.
     Types of property '"ignore-prop"' are incompatible.
@@ -12,7 +11,6 @@ file.tsx(31,52): error TS2322: Type '(val: string) => void' is not assignable to
     Type 'number' is not assignable to type 'string'.
 
 
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== file.tsx (4 errors) ====
     import React = require('react')
     
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
deleted file mode 100644
index 83d30a9ba4ae0..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react')
-    
-    declare function OverloadComponent<U>(): JSX.Element;
-    declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": boolean}): JSX.Element;
-    declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
-    
-    // OK
-    function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, arg2: U) {
-        let a0 = <OverloadComponent {...arg1} a="hello" ignore-prop />;
-        let a1 = <OverloadComponent {...arg2} ignore-pro="hello world" />;
-        let a2 = <OverloadComponent {...arg2} />;
-        let a3 = <OverloadComponent {...arg1} ignore-prop />;
-        let a4 = <OverloadComponent />;
-        let a5 = <OverloadComponent {...arg2} ignore-prop="hello" {...arg1} />;
-        let a6 = <OverloadComponent {...arg2} ignore-prop {...arg1} />;
-    }
-    
-    declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
-    declare function Link<U>(l: {func: (arg1:U, arg2: string)=>void}): JSX.Element;
-    function createLink(func: (a: number)=>void) {
-        let o = <Link func={func} />
-        let o1 = <Link func={(a:number, b:string)=>{}} />;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
index 9354b3dad1cfb..e008e91ddc043 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
@@ -14,11 +14,12 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 }
 
 //// [file.jsx]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var React = require("react");
-// Error
-function Baz(arg1, arg2) {
-    var a0 = <OverloadComponent a={arg1.b}/>;
-    var a2 = <OverloadComponent {...arg1} ignore-prop/>; // missing a
-}
+define(["require", "exports", "react"], function (require, exports, React) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // Error
+    function Baz(arg1, arg2) {
+        var a0 = <OverloadComponent a={arg1.b}/>;
+        var a2 = <OverloadComponent {...arg1} ignore-prop/>; // missing a
+    }
+});
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
deleted file mode 100644
index 85277801e12b1..0000000000000
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file.tsx (0 errors) ====
-    import React = require('react')
-    
-    declare function Component<U>(l: U): JSX.Element;
-    function createComponent<T extends { prop: number }>(arg: T) {
-        let a1 = <Component {...arg} />;
-        let a2 = <Component {...arg} prop1 />;
-    }
-    
-    declare function ComponentSpecific<U>(l: { prop: U }): JSX.Element;
-    declare function ComponentSpecific1<U>(l: { prop: U, "ignore-prop": number }): JSX.Element;
-    
-    function Bar<T extends { prop: number }>(arg: T) {
-        let a1 = <ComponentSpecific {...arg} ignore-prop="hi" />;  // U is number
-        let a2 = <ComponentSpecific1 {...arg} ignore-prop={10} />;  // U is number
-        let a3 = <ComponentSpecific {...arg} prop="hello" />;   // U is "hello"
-        let a4 = <ComponentSpecific {...arg} prop1="hello" />;   // U is "hello"
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js
index 8413241fabb1f..5cdb7e0aa9378 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -6,8 +6,10 @@ export type callback<T> = () => T;
 export type CallbackArray<T extends callback> = () => T;
 
 //// [typeAliasDeclarationEmit.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
 
 
 //// [typeAliasDeclarationEmit.d.ts]
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.errors.txt b/tests/baselines/reference/typeAliasDeclarationEmit2.errors.txt
deleted file mode 100644
index f832ebfd15ebd..0000000000000
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== typeAliasDeclarationEmit2.ts (0 errors) ====
-    export type A<a> = { value: a };
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAndNamespaceExportMerge.js b/tests/baselines/reference/typeAndNamespaceExportMerge.js
index b7d519b184731..fcf77459c49af 100644
--- a/tests/baselines/reference/typeAndNamespaceExportMerge.js
+++ b/tests/baselines/reference/typeAndNamespaceExportMerge.js
@@ -24,42 +24,9 @@ exports.COFFEE = 0;
 exports.TEA = 1;
 //// [drink.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Drink = void 0;
-exports.Drink = __importStar(require("./constants"));
+exports.Drink = require("./constants");
 //// [index.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt
deleted file mode 100644
index 4c18d0e2fe3a8..0000000000000
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== typeParameterCompatibilityAccrossDeclarations.ts (0 errors) ====
-    var a = {
-       x: function <T>(y: T): T { return null; }
-    }
-    var a2 = {
-       x: function (y: any): any { return null; }
-    }
-    export interface I {
-       x<T>(y: T): T;
-    }
-    export interface I2 {
-       x(y: any): any;
-    }
-     
-    var i: I;
-    var i2: I2;
-     
-    a = i; // error
-    i = a; // error
-     
-    a2 = i2; // no error
-    i2 = a2; // no error
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
index 5eb9001881bde..2b5e9bf0e62ad 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
@@ -27,7 +27,6 @@ var a2 = {
 >function (y: any): any { return null; } : (y: any) => any
 >                                        : ^ ^^   ^^^^^   
 >y : any
->  : ^^^
 }
 export interface I {
    x<T>(y: T): T;
@@ -41,7 +40,6 @@ export interface I2 {
 >x : (y: any) => any
 >  : ^ ^^   ^^^^^   
 >y : any
->  : ^^^
 }
  
 var i: I;
diff --git a/tests/baselines/reference/typeResolution.errors.txt b/tests/baselines/reference/typeResolution.errors.txt
deleted file mode 100644
index f6d8947e4958a..0000000000000
--- a/tests/baselines/reference/typeResolution.errors.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== typeResolution.ts (0 errors) ====
-    export namespace TopLevelModule1 {
-        export namespace SubModule1 {
-            export namespace SubSubModule1 {
-                export class ClassA {
-                    public AisIn1_1_1() {
-                        // Try all qualified names of this type
-                        var a1: ClassA; a1.AisIn1_1_1();
-                        var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
-                        var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
-                        var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
-                        
-                        // Two variants of qualifying a peer type
-                        var b1: ClassB; b1.BisIn1_1_1();
-                        var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1();
-                        
-                        // Type only accessible from the root
-                        var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
-                        
-                        // Interface reference
-                        var d1: InterfaceX; d1.XisIn1_1_1();
-                        var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
-                    }
-                }
-                export class ClassB {
-                    public BisIn1_1_1() {
-                        /** Exactly the same as above in AisIn1_1_1 **/
-                        
-                        // Try all qualified names of this type
-                        var a1: ClassA; a1.AisIn1_1_1();
-                        var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
-                        var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
-                        var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
-                        
-                        // Two variants of qualifying a peer type
-                        var b1: ClassB; b1.BisIn1_1_1();
-                        var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1();
-                        
-                        // Type only accessible from the root
-                        var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
-                        var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3();
-                        
-                        // Interface reference
-                        var d1: InterfaceX; d1.XisIn1_1_1();
-                        var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
-                    }
-                }
-                export interface InterfaceX { XisIn1_1_1(); }
-                class NonExportedClassQ {
-                    constructor() {
-                        function QQ() {
-                            /* Sampling of stuff from AisIn1_1_1 */
-                            var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
-                            var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
-                            var d1: InterfaceX; d1.XisIn1_1_1();
-                            var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3();
-                        }
-                    }
-                }
-            }
-            
-            // Should have no effect on S1.SS1.ClassA above because it is not exported
-            class ClassA {
-                constructor() {
-                    function AA() {
-                        var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
-                        var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
-                        var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
-                        
-                        // Interface reference
-                        var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
-                    }
-                }
-            }
-        }
-    
-        export namespace SubModule2 {
-            export namespace SubSubModule2 {
-                // No code here since these are the mirror of the above calls
-                export class ClassA { public AisIn1_2_2() { } }
-                export class ClassB { public BisIn1_2_2() { } }
-                export class ClassC { public CisIn1_2_2() { } }
-                export interface InterfaceY { YisIn1_2_2(); }
-                interface NonExportedInterfaceQ { }
-            }
-            
-            export interface InterfaceY { YisIn1_2(); }
-        }
-        
-        class ClassA {
-            public AisIn1() { }
-        }
-    
-        interface InterfaceY {
-            YisIn1();
-        }
-        
-        namespace NotExportedModule {
-            export class ClassA { }
-        }
-    }
-    
-    namespace TopLevelModule2 {
-        export namespace SubModule3 {
-            export class ClassA {
-                public AisIn2_3() { }
-            }
-        }
-    }
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.types b/tests/baselines/reference/typeResolution.types
index 71383c75e83c8..0f81eee98a3a2 100644
--- a/tests/baselines/reference/typeResolution.types
+++ b/tests/baselines/reference/typeResolution.types
@@ -137,7 +137,6 @@ export namespace TopLevelModule1 {
 >d1 : InterfaceX
 >   : ^^^^^^^^^^
 >d1.XisIn1_1_1() : any
->                : ^^^
 >d1.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d1 : InterfaceX
@@ -151,7 +150,6 @@ export namespace TopLevelModule1 {
 >SubSubModule1 : any
 >              : ^^^
 >d2.XisIn1_1_1() : any
->                : ^^^
 >d2.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d2 : InterfaceX
@@ -302,7 +300,6 @@ export namespace TopLevelModule1 {
 >d1 : InterfaceX
 >   : ^^^^^^^^^^
 >d1.XisIn1_1_1() : any
->                : ^^^
 >d1.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d1 : InterfaceX
@@ -316,7 +313,6 @@ export namespace TopLevelModule1 {
 >SubSubModule1 : any
 >              : ^^^
 >d2.XisIn1_1_1() : any
->                : ^^^
 >d2.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d2 : InterfaceX
@@ -379,7 +375,6 @@ export namespace TopLevelModule1 {
 >d1 : InterfaceX
 >   : ^^^^^^^^^^
 >d1.XisIn1_1_1() : any
->                : ^^^
 >d1.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d1 : InterfaceX
@@ -472,7 +467,6 @@ export namespace TopLevelModule1 {
 >SubSubModule1 : any
 >              : ^^^
 >d2.XisIn1_1_1() : any
->                : ^^^
 >d2.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d2 : SubSubModule1.InterfaceX
diff --git a/tests/baselines/reference/typeUsedAsValueError2.errors.txt b/tests/baselines/reference/typeUsedAsValueError2.errors.txt
index 76f4d379dbc94..16eb9d51ca4b0 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.errors.txt
+++ b/tests/baselines/reference/typeUsedAsValueError2.errors.txt
@@ -3,8 +3,8 @@ world.ts(5,1): error TS2708: Cannot use namespace 'HelloNamespace' as a value.
 
 
 ==== world.ts (2 errors) ====
-    import HelloInterface = require("./helloInterface");
-    import HelloNamespace = require("./helloNamespace");
+    import HelloInterface = require("helloInterface");
+    import HelloNamespace = require("helloNamespace");
     
     HelloInterface.world;
     ~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/typeUsedAsValueError2.js b/tests/baselines/reference/typeUsedAsValueError2.js
index 4e69754c6ee4e..d7b083e1b6c96 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.js
+++ b/tests/baselines/reference/typeUsedAsValueError2.js
@@ -15,20 +15,26 @@ namespace HelloNamespace {
 export = HelloNamespace;
 
 //// [world.ts]
-import HelloInterface = require("./helloInterface");
-import HelloNamespace = require("./helloNamespace");
+import HelloInterface = require("helloInterface");
+import HelloNamespace = require("helloNamespace");
 
 HelloInterface.world;
 HelloNamespace.world;
 
 //// [helloInterface.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
 //// [helloNamespace.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
 //// [world.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-HelloInterface.world;
-HelloNamespace.world;
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    HelloInterface.world;
+    HelloNamespace.world;
+});
diff --git a/tests/baselines/reference/typeUsedAsValueError2.symbols b/tests/baselines/reference/typeUsedAsValueError2.symbols
index 2675ab57abf64..d4f9237cfbec5 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.symbols
+++ b/tests/baselines/reference/typeUsedAsValueError2.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/typeUsedAsValueError2.ts] ////
 
 === world.ts ===
-import HelloInterface = require("./helloInterface");
+import HelloInterface = require("helloInterface");
 >HelloInterface : Symbol(HelloInterface, Decl(world.ts, 0, 0))
 
-import HelloNamespace = require("./helloNamespace");
->HelloNamespace : Symbol(HelloNamespace, Decl(world.ts, 0, 52))
+import HelloNamespace = require("helloNamespace");
+>HelloNamespace : Symbol(HelloNamespace, Decl(world.ts, 0, 50))
 
 HelloInterface.world;
 HelloNamespace.world;
diff --git a/tests/baselines/reference/typeUsedAsValueError2.types b/tests/baselines/reference/typeUsedAsValueError2.types
index 5a20c8b8c3208..f0860e66efe17 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.types
+++ b/tests/baselines/reference/typeUsedAsValueError2.types
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/typeUsedAsValueError2.ts] ////
 
 === world.ts ===
-import HelloInterface = require("./helloInterface");
+import HelloInterface = require("helloInterface");
 >HelloInterface : any
 >               : ^^^
 
-import HelloNamespace = require("./helloNamespace");
+import HelloNamespace = require("helloNamespace");
 >HelloNamespace : any
 >               : ^^^
 
diff --git a/tests/baselines/reference/typingsLookupAmd.errors.txt b/tests/baselines/reference/typingsLookupAmd.errors.txt
deleted file mode 100644
index 219e834d67ac1..0000000000000
--- a/tests/baselines/reference/typingsLookupAmd.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== /x/y/foo.ts (0 errors) ====
-    import {B} from "b";
-    
-==== /node_modules/@types/a/index.d.ts (0 errors) ====
-    export declare class A {}
-    
-==== /x/node_modules/@types/b/index.d.ts (0 errors) ====
-    import {A} from "a";
-    export declare class B extends A {}
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
index 4e68023410707..6137a45b0f418 100644
--- a/tests/baselines/reference/umd-augmentation-1.js
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -40,42 +40,9 @@ var t = p.x;
 
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="math2d-augment.d.ts" />
-var m = __importStar(require("math2d"));
+var m = require("math2d");
 var v = new m.Vector(3, 2);
 var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
index 1acf4fe86e199..9350a0c1d14cb 100644
--- a/tests/baselines/reference/umd-augmentation-3.js
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -46,42 +46,9 @@ var t = p.x;
 
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="math2d-augment.d.ts" />
-var m = __importStar(require("math2d"));
+var m = require("math2d");
 var v = new m.Vector(3, 2);
 var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
index 7fec5750c4632..54aa4598b2035 100644
--- a/tests/baselines/reference/umd3.js
+++ b/tests/baselines/reference/umd3.js
@@ -15,41 +15,8 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var Foo = __importStar(require("./foo"));
+var Foo = require("./foo");
 Foo.fn();
 var x;
 var y = x.n;
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
index 5c9760299ebff..00aec9578bb65 100644
--- a/tests/baselines/reference/umd4.js
+++ b/tests/baselines/reference/umd4.js
@@ -15,41 +15,8 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var Bar = __importStar(require("./foo"));
+var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index 11057d45eb673..e31a5c9de4886 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -17,41 +17,8 @@ let z = Foo;
 
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var Bar = __importStar(require("./foo"));
+var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
diff --git a/tests/baselines/reference/umd8.symbols b/tests/baselines/reference/umd8.symbols
index 0cb5bdf2f270f..7809a99f8fbca 100644
--- a/tests/baselines/reference/umd8.symbols
+++ b/tests/baselines/reference/umd8.symbols
@@ -10,9 +10,9 @@ let y: Foo; // OK in type position
 >Foo : Symbol(Foo, Decl(foo.d.ts, 6, 15))
 
 y.foo();
->y.foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21))
+>y.foo : Symbol(ff.foo, Decl(foo.d.ts, 0, 21))
 >y : Symbol(y, Decl(a.ts, 3, 3))
->foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21))
+>foo : Symbol(ff.foo, Decl(foo.d.ts, 0, 21))
 
 let z: Foo.SubThing; // OK in ns position
 >z : Symbol(z, Decl(a.ts, 5, 3))
diff --git a/tests/baselines/reference/umd8.types b/tests/baselines/reference/umd8.types
index 57d63c467b132..180d98358b78d 100644
--- a/tests/baselines/reference/umd8.types
+++ b/tests/baselines/reference/umd8.types
@@ -7,16 +7,16 @@ import * as ff from './foo';
 >   : ^^^^^^^^^
 
 let y: Foo; // OK in type position
->y : import("foo")
->  : ^^^^^^^^^^^^^
+>y : ff
+>  : ^^
 
 y.foo();
 >y.foo() : number
 >        : ^^^^^^
 >y.foo : () => number
 >      : ^^^^^^      
->y : import("foo")
->  : ^^^^^^^^^^^^^
+>y : ff
+>  : ^^
 >foo : () => number
 >    : ^^^^^^      
 
@@ -29,8 +29,8 @@ let z: Foo.SubThing; // OK in ns position
 let x: any = Foo; // Not OK in value position
 >x : any
 >  : ^^^
->Foo : typeof import("foo")
->    : ^^^^^^^^^^^^^^^^^^^^
+>Foo : typeof ff
+>    : ^^^^^^^^^
 
 === foo.d.ts ===
 declare class Thing {
diff --git a/tests/baselines/reference/umdDependencyComment2.errors.txt b/tests/baselines/reference/umdDependencyComment2.errors.txt
index e408be858eade..1536784b8cea0 100644
--- a/tests/baselines/reference/umdDependencyComment2.errors.txt
+++ b/tests/baselines/reference/umdDependencyComment2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 umdDependencyComment2.ts(3,21): error TS2792: Cannot find module 'm2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== umdDependencyComment2.ts (1 errors) ====
     ///<amd-dependency path='bar'/>
     
diff --git a/tests/baselines/reference/umdDependencyCommentName1.errors.txt b/tests/baselines/reference/umdDependencyCommentName1.errors.txt
index 3aed21ff4dcd0..d1fcb77a36b6e 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.errors.txt
+++ b/tests/baselines/reference/umdDependencyCommentName1.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 umdDependencyCommentName1.ts(3,21): error TS2792: Cannot find module 'm2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== umdDependencyCommentName1.ts (1 errors) ====
     ///<amd-dependency path='bar' name='b'/>
     
diff --git a/tests/baselines/reference/umdDependencyCommentName2.errors.txt b/tests/baselines/reference/umdDependencyCommentName2.errors.txt
index 9e1725b6cd662..35840c3a665b9 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.errors.txt
+++ b/tests/baselines/reference/umdDependencyCommentName2.errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 umdDependencyCommentName2.ts(5,21): error TS2792: Cannot find module 'm2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== umdDependencyCommentName2.ts (1 errors) ====
     ///<amd-dependency path='bar' name='b'/>
     ///<amd-dependency path='foo'/>
diff --git a/tests/baselines/reference/umdNamedAmdMode.errors.txt b/tests/baselines/reference/umdNamedAmdMode.errors.txt
deleted file mode 100644
index d4a34f0703eec..0000000000000
--- a/tests/baselines/reference/umdNamedAmdMode.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=UMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== main.ts (0 errors) ====
-    /// <amd-module name="a"/>
-    export const a = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/undeclaredModuleError.errors.txt b/tests/baselines/reference/undeclaredModuleError.errors.txt
index 296075556541c..20f314758a1c8 100644
--- a/tests/baselines/reference/undeclaredModuleError.errors.txt
+++ b/tests/baselines/reference/undeclaredModuleError.errors.txt
@@ -1,4 +1,4 @@
-undeclaredModuleError.ts(1,21): error TS2307: Cannot find module 'fs' or its corresponding type declarations.
+undeclaredModuleError.ts(1,21): error TS2792: Cannot find module 'fs'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 undeclaredModuleError.ts(8,29): error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: fs.Stats, name: string) => boolean'.
   Type 'void' is not assignable to type 'boolean'.
 undeclaredModuleError.ts(11,41): error TS2304: Cannot find name 'IDoNotExist'.
@@ -7,7 +7,7 @@ undeclaredModuleError.ts(11,41): error TS2304: Cannot find name 'IDoNotExist'.
 ==== undeclaredModuleError.ts (3 errors) ====
     import fs = require('fs');
                         ~~~~
-!!! error TS2307: Cannot find module 'fs' or its corresponding type declarations.
+!!! error TS2792: Cannot find module 'fs'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
     function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {}
     
     function join(...paths: string[]) {}
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index 2c57e85fa8dcf..13ac6a20bfdae 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -18,23 +18,24 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
 }
 
 //// [undeclaredModuleError.js]
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs = require("fs");
-function readdir(path, accept, callback) { }
-function join() {
-    var paths = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        paths[_i] = arguments[_i];
+define(["require", "exports", "fs"], function (require, exports, fs) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    function readdir(path, accept, callback) { }
+    function join() {
+        var paths = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            paths[_i] = arguments[_i];
+        }
     }
-}
-function instrumentFile(covFileDir, covFileName, originalFilePath) {
-    fs.readFile(originalFilePath, function () {
-        readdir(covFileDir, function () {
-        }, function (error, files) {
-            files.forEach(function (file) {
-                var fullPath = join(IDoNotExist);
+    function instrumentFile(covFileDir, covFileName, originalFilePath) {
+        fs.readFile(originalFilePath, function () {
+            readdir(covFileDir, function () {
+            }, function (error, files) {
+                files.forEach(function (file) {
+                    var fullPath = join(IDoNotExist);
+                });
             });
         });
-    });
-}
+    }
+});
diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js
index df5bac74f5a10..9f93f968c4bfa 100644
--- a/tests/baselines/reference/untypedModuleImport.js
+++ b/tests/baselines/reference/untypedModuleImport.js
@@ -20,41 +20,8 @@ foo(bar());
 
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var foo = __importStar(require("foo"));
+var foo = require("foo");
 foo.bar();
 //// [b.js]
 "use strict";
@@ -63,41 +30,8 @@ var foo = require("foo");
 foo();
 //// [c.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var foo_1 = __importStar(require("foo"));
+var foo_1 = require("foo");
 require("./a");
 require("./b");
 (0, foo_1.default)((0, foo_1.bar)());
diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.js b/tests/baselines/reference/untypedModuleImport_allowJs.js
index 8a972c0a66378..c4bbe0d49f8c6 100644
--- a/tests/baselines/reference/untypedModuleImport_allowJs.js
+++ b/tests/baselines/reference/untypedModuleImport_allowJs.js
@@ -10,9 +10,6 @@ foo.bar();
 
 //// [a.js]
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var foo_1 = __importDefault(require("foo"));
+var foo_1 = require("foo");
 foo_1.default.bar();
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index 115745bcd5483..eacd3e7e86a45 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -30,43 +30,10 @@ exports.Member = Member;
 exports.default = Member;
 //// [a.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var b_1 = require("./b");
-var b_2 = __importStar(require("./b"));
-var ns = __importStar(require("./b"));
+var b_2 = require("./b");
+var ns = require("./b");
 var r = require("./b");
 new b_1.Member();
 new b_2.default();
diff --git a/tests/baselines/reference/unusedImports11.types b/tests/baselines/reference/unusedImports11.types
index b6d5357aeb4de..1dadad07694cb 100644
--- a/tests/baselines/reference/unusedImports11.types
+++ b/tests/baselines/reference/unusedImports11.types
@@ -18,8 +18,8 @@ import * as ns from './b';
 >   : ^^^^^^^^^
 
 import r = require("./b");
->r : typeof r
->  : ^^^^^^^^
+>r : typeof ns
+>  : ^^^^^^^^^
 
 new Member();
 >new Member() : Member
@@ -54,8 +54,8 @@ new r.Member();
 >               : ^^^^^^
 >r.Member : typeof Member
 >         : ^^^^^^^^^^^^^
->r : typeof r
->  : ^^^^^^^^
+>r : typeof ns
+>  : ^^^^^^^^^
 >Member : typeof Member
 >       : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unusedImports12.types b/tests/baselines/reference/unusedImports12.types
index a1064cb5ba1f9..9c3f212fc7ecf 100644
--- a/tests/baselines/reference/unusedImports12.types
+++ b/tests/baselines/reference/unusedImports12.types
@@ -18,8 +18,8 @@ import * as ns from './b';
 >   : ^^^^^^^^^
 
 import r = require("./b");
->r : typeof r
->  : ^^^^^^^^
+>r : typeof ns
+>  : ^^^^^^^^^
 
 === b.ts ===
 export class Member {}
diff --git a/tests/baselines/reference/unusedImports_entireImportDeclaration.js b/tests/baselines/reference/unusedImports_entireImportDeclaration.js
index 4a988d666aa0a..14189021e317d 100644
--- a/tests/baselines/reference/unusedImports_entireImportDeclaration.js
+++ b/tests/baselines/reference/unusedImports_entireImportDeclaration.js
@@ -26,46 +26,10 @@ exports.b = 0;
 exports.default = 0;
 //// [b.js]
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var a_1 = __importDefault(require("./a"));
+var a_1 = require("./a");
 a_1.default;
-var a_2 = __importDefault(require("./a"));
+var a_2 = require("./a");
 a_2.default;
-var ns3 = __importStar(require("./a"));
+var ns3 = require("./a");
 ns3;
diff --git a/tests/baselines/reference/unusedImports_entireImportDeclaration.types b/tests/baselines/reference/unusedImports_entireImportDeclaration.types
index be4d60f3070bc..5d8ef7954cc97 100644
--- a/tests/baselines/reference/unusedImports_entireImportDeclaration.types
+++ b/tests/baselines/reference/unusedImports_entireImportDeclaration.types
@@ -53,8 +53,8 @@ d3;
 import d4, * as ns2 from "./a";
 >d4 : 0
 >   : ^
->ns2 : typeof ns2
->    : ^^^^^^^^^^
+>ns2 : typeof ns
+>    : ^^^^^^^^^
 
 d4;
 >d4 : 0
@@ -63,10 +63,10 @@ d4;
 import d5, * as ns3 from "./a";
 >d5 : 0
 >   : ^
->ns3 : typeof ns3
->    : ^^^^^^^^^^
+>ns3 : typeof ns
+>    : ^^^^^^^^^
 
 ns3;
->ns3 : typeof ns3
->    : ^^^^^^^^^^
+>ns3 : typeof ns
+>    : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt
deleted file mode 100644
index 7660f4399103c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsTopLevelOfModule.1.ts (0 errors) ====
-    export const x = 1;
-    export { y };
-    
-    using z = { [Symbol.dispose]() {} };
-    
-    const y = 2;
-    
-    export const w = 3;
-    
-    export default 4;
-    
-    console.log(w, x, y, z);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=system).errors.txt b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=system).errors.txt
deleted file mode 100644
index e3f296be04027..0000000000000
--- a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=system).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsTopLevelOfModule.1.ts (0 errors) ====
-    export const x = 1;
-    export { y };
-    
-    using z = { [Symbol.dispose]() {} };
-    
-    const y = 2;
-    
-    export const w = 3;
-    
-    export default 4;
-    
-    console.log(w, x, y, z);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.2(module=amd).errors.txt b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.2(module=amd).errors.txt
deleted file mode 100644
index a9aa99acde3ec..0000000000000
--- a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.2(module=amd).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsTopLevelOfModule.2.ts (0 errors) ====
-    using z = { [Symbol.dispose]() {} };
-    
-    const y = 2;
-    
-    console.log(y, z);
-    export = 4;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=amd).errors.txt b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=amd).errors.txt
deleted file mode 100644
index 15161cb9f73a5..0000000000000
--- a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=amd).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsTopLevelOfModule.3.ts (0 errors) ====
-    export { y };
-    
-    using z = { [Symbol.dispose]() {} };
-    
-    if (false) {
-        var y = 1;
-    }
-    
-    function f() {
-        console.log(y, z);
-    }
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=system).errors.txt b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=system).errors.txt
deleted file mode 100644
index f037d46731a0d..0000000000000
--- a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=system).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsTopLevelOfModule.3.ts (0 errors) ====
-    export { y };
-    
-    using z = { [Symbol.dispose]() {} };
-    
-    if (false) {
-        var y = 1;
-    }
-    
-    function f() {
-        console.log(y, z);
-    }
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es2015).errors.txt
deleted file mode 100644
index 6410038d9075c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.1.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).errors.txt
deleted file mode 100644
index 6410038d9075c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.1.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=esnext).errors.txt
deleted file mode 100644
index 6410038d9075c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.1.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es2015).errors.txt
deleted file mode 100644
index c0d483fd76b74..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.10.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).errors.txt
deleted file mode 100644
index c0d483fd76b74..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.10.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=esnext).errors.txt
deleted file mode 100644
index c0d483fd76b74..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.10.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es2015).errors.txt
deleted file mode 100644
index 56a1dd4015895..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.11.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).errors.txt
deleted file mode 100644
index 56a1dd4015895..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.11.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=esnext).errors.txt
deleted file mode 100644
index 56a1dd4015895..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.11.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es2015).errors.txt
deleted file mode 100644
index 336ca1f5ff380..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.12.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).errors.txt
deleted file mode 100644
index 336ca1f5ff380..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.12.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=esnext).errors.txt
deleted file mode 100644
index 336ca1f5ff380..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.12.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es2015).errors.txt
deleted file mode 100644
index 25f652aa4c866..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.2.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).errors.txt
deleted file mode 100644
index 25f652aa4c866..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.2.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=esnext).errors.txt
deleted file mode 100644
index 25f652aa4c866..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.2.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es2015).errors.txt
deleted file mode 100644
index ce1fcbdf5588a..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.3.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class C {
-    }
-    
-    void C;
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).errors.txt
deleted file mode 100644
index ce1fcbdf5588a..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.3.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class C {
-    }
-    
-    void C;
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=esnext).errors.txt
deleted file mode 100644
index ce1fcbdf5588a..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.3.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class C {
-    }
-    
-    void C;
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es2015).errors.txt
deleted file mode 100644
index 2cdefbe879ab6..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.4.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).errors.txt
deleted file mode 100644
index 2cdefbe879ab6..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.4.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=esnext).errors.txt
deleted file mode 100644
index 2cdefbe879ab6..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.4.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es2015).errors.txt
deleted file mode 100644
index 5dcb10fe6e706..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.5.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).errors.txt
deleted file mode 100644
index 5dcb10fe6e706..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.5.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=esnext).errors.txt
deleted file mode 100644
index 5dcb10fe6e706..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.5.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es2015).errors.txt
deleted file mode 100644
index 17ee7bda8e28c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.6.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).errors.txt
deleted file mode 100644
index 17ee7bda8e28c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.6.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=esnext).errors.txt
deleted file mode 100644
index 17ee7bda8e28c..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.6.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es2015).errors.txt
deleted file mode 100644
index 2b2a58dae5285..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.7.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    using after = null;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).errors.txt
deleted file mode 100644
index 2b2a58dae5285..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.7.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    using after = null;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=esnext).errors.txt
deleted file mode 100644
index 2b2a58dae5285..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.7.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    using after = null;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es2015).errors.txt
deleted file mode 100644
index 00ecabbfb19fe..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.8.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).errors.txt
deleted file mode 100644
index 00ecabbfb19fe..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.8.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=esnext).errors.txt
deleted file mode 100644
index 00ecabbfb19fe..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.8.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es2015).errors.txt
deleted file mode 100644
index 106504df856e9..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.9.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class C {
-    }
-    
-    void C;
-    
-    using after = null;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).errors.txt
deleted file mode 100644
index 106504df856e9..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.9.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class C {
-    }
-    
-    void C;
-    
-    using after = null;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=esnext).errors.txt
deleted file mode 100644
index 106504df856e9..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithESClassDecorators.9.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class C {
-    }
-    
-    void C;
-    
-    using after = null;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).errors.txt
deleted file mode 100644
index dd484859a1bf6..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.1.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).errors.txt
deleted file mode 100644
index dd484859a1bf6..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.1.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).errors.txt
deleted file mode 100644
index dd484859a1bf6..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.1.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).errors.txt
deleted file mode 100644
index f82f485b57212..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.10.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).errors.txt
deleted file mode 100644
index f82f485b57212..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.10.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).errors.txt
deleted file mode 100644
index f82f485b57212..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.10.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).errors.txt
deleted file mode 100644
index 3e18b51fe1984..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.11.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).errors.txt
deleted file mode 100644
index 3e18b51fe1984..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.11.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).errors.txt
deleted file mode 100644
index 3e18b51fe1984..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.11.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).errors.txt
deleted file mode 100644
index 2e992776b82f8..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.12.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).errors.txt
deleted file mode 100644
index 2e992776b82f8..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.12.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).errors.txt
deleted file mode 100644
index 2e992776b82f8..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.12.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).errors.txt
deleted file mode 100644
index d0efc568d924e..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.2.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).errors.txt
deleted file mode 100644
index d0efc568d924e..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.2.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).errors.txt
deleted file mode 100644
index d0efc568d924e..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.2.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).errors.txt
deleted file mode 100644
index dba53684b2de4..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.3.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).errors.txt
deleted file mode 100644
index dba53684b2de4..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.3.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).errors.txt
deleted file mode 100644
index dba53684b2de4..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.3.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class C {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).errors.txt
deleted file mode 100644
index 30926090ad838..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.4.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).errors.txt
deleted file mode 100644
index 30926090ad838..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.4.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).errors.txt
deleted file mode 100644
index 30926090ad838..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.4.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    export default class {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).errors.txt
deleted file mode 100644
index 61926462d80bb..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.5.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).errors.txt
deleted file mode 100644
index 61926462d80bb..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.5.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).errors.txt
deleted file mode 100644
index 61926462d80bb..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.5.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).errors.txt
deleted file mode 100644
index 34f7f2659caba..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.6.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).errors.txt
deleted file mode 100644
index 34f7f2659caba..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.6.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).errors.txt
deleted file mode 100644
index 34f7f2659caba..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.6.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    using before = null;
-    
-    @dec
-    class C {
-    }
-    
-    export { C as D };
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).errors.txt
deleted file mode 100644
index c84706fe23cde..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.7.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).errors.txt
deleted file mode 100644
index c84706fe23cde..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.7.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).errors.txt
deleted file mode 100644
index c84706fe23cde..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.7.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).errors.txt
deleted file mode 100644
index 596c8d06d8322..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.8.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).errors.txt
deleted file mode 100644
index 596c8d06d8322..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.8.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).errors.txt
deleted file mode 100644
index 596c8d06d8322..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.8.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).errors.txt
deleted file mode 100644
index 66ce3c7990386..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.9.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).errors.txt
deleted file mode 100644
index 66ce3c7990386..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.9.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).errors.txt
deleted file mode 100644
index 66ce3c7990386..0000000000000
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== usingDeclarationsWithLegacyClassDecorators.9.ts (0 errors) ====
-    export {};
-    
-    declare var dec: any;
-    
-    @dec
-    export default class C {
-    }
-    
-    using after = null;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.errors.txt b/tests/baselines/reference/varArgsOnConstructorTypes.errors.txt
deleted file mode 100644
index ea3caaa25cc9e..0000000000000
--- a/tests/baselines/reference/varArgsOnConstructorTypes.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== varArgsOnConstructorTypes.ts (0 errors) ====
-    export class A {
-        constructor(ctor) { }
-    }
-    
-    export class B extends A {
-        private p1: number;
-        private p2: string;
-    
-        constructor(element: any, url: string) {
-           super(element);
-            this.p1 = element;
-            this.p2 = url;
-        }
-    }
-    
-    export interface I1 {
-        register(inputClass: new(...params: any[]) => A);
-        register(inputClass: { new (...params: any[]): A; }[]);
-    }
-    
-    
-    var reg: I1;
-    reg.register(B);
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.types b/tests/baselines/reference/varArgsOnConstructorTypes.types
index dc92a7cf583ab..7be083f9b5d39 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.types
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.types
@@ -7,7 +7,6 @@ export class A {
 
     constructor(ctor) { }
 >ctor : any
->     : ^^^
 }
 
 export class B extends A {
@@ -26,7 +25,6 @@ export class B extends A {
 
     constructor(element: any, url: string) {
 >element : any
->        : ^^^
 >url : string
 >    : ^^^^^^
 
@@ -36,11 +34,9 @@ export class B extends A {
 >super : typeof A
 >      : ^^^^^^^^
 >element : any
->        : ^^^
 
         this.p1 = element;
 >this.p1 = element : any
->                  : ^^^
 >this.p1 : number
 >        : ^^^^^^
 >this : this
@@ -48,7 +44,6 @@ export class B extends A {
 >p1 : number
 >   : ^^^^^^
 >element : any
->        : ^^^
 
         this.p2 = url;
 >this.p2 = url : string
@@ -89,7 +84,6 @@ var reg: I1;
 
 reg.register(B);
 >reg.register(B) : any
->                : ^^^
 >reg.register : { (inputClass: new (...params: any[]) => A): any; (inputClass: { new (...params: any[]): A; }[]): any; }
 >             : ^^^          ^^                           ^^^^^^^^^          ^^                                ^^^^^^^^^
 >reg : I1
diff --git a/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
index 660f32f46e579..8c173b0d85ed9 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
@@ -3,7 +3,6 @@ error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
-error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
@@ -11,6 +10,5 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
 !!! error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
-!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== verbatimModuleSyntaxCompat.ts (0 errors) ====
     export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt
index 226eefca29382..906193198aeca 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt
@@ -1,8 +1,6 @@
-error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 /main.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
 
 
-!!! error TS5107: Option 'esModuleInterop=false' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 ==== /decl.d.ts (0 errors) ====
     declare class CJSy {}
     export = CJSy;
diff --git a/tests/baselines/reference/withExportDecl.errors.txt b/tests/baselines/reference/withExportDecl.errors.txt
deleted file mode 100644
index 2b16d72472e8b..0000000000000
--- a/tests/baselines/reference/withExportDecl.errors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== withExportDecl.ts (0 errors) ====
-    var simpleVar;
-    export var exportedSimpleVar;
-    
-    var anotherVar: any;
-    var varWithSimpleType: number;
-    var varWithArrayType: number[];
-    
-    var varWithInitialValue = 30;
-    export var exportedVarWithInitialValue = 70;
-    
-    var withComplicatedValue = { x: 30, y: 70, desc: "position" };
-    export var exportedWithComplicatedValue = { x: 30, y: 70, desc: "position" };
-    
-    declare var declaredVar;
-    declare var declareVar2
-    
-    declare var declaredVar;
-    declare var deckareVarWithType: number;
-    export declare var exportedDeclaredVar: number;
-    
-    var arrayVar: string[] = ['a', 'b'];
-    
-    export var exportedArrayVar: { x: number; y: string; }[] ;
-    exportedArrayVar.push({ x: 30, y : 'hello world' });
-    
-    function simpleFunction() {
-        return {
-            x: "Hello",
-            y: "word",
-            n: 2
-        };
-    }
-    
-    export function exportedFunction() {
-        return simpleFunction();
-    }
-    
-    namespace m1 {
-        export function foo() {
-            return "Hello";
-        }
-    }
-    export declare namespace m2 {
-    
-        export var a: number;
-    }
-    
-    
-    export namespace m3 {
-    
-        export function foo() {
-            return m1.foo();
-        }
-    }
-    
-    export var eVar1, eVar2 = 10;
-    var eVar22;
-    export var eVar3 = 10, eVar4, eVar5;
\ No newline at end of file
diff --git a/tests/baselines/reference/withExportDecl.types b/tests/baselines/reference/withExportDecl.types
index 72d5370511f0b..124a9fe99303c 100644
--- a/tests/baselines/reference/withExportDecl.types
+++ b/tests/baselines/reference/withExportDecl.types
@@ -3,15 +3,12 @@
 === withExportDecl.ts ===
 var simpleVar;
 >simpleVar : any
->          : ^^^
 
 export var exportedSimpleVar;
 >exportedSimpleVar : any
->                  : ^^^
 
 var anotherVar: any;
 >anotherVar : any
->           : ^^^
 
 var varWithSimpleType: number;
 >varWithSimpleType : number
@@ -71,15 +68,12 @@ export var exportedWithComplicatedValue = { x: 30, y: 70, desc: "position" };
 
 declare var declaredVar;
 >declaredVar : any
->            : ^^^
 
 declare var declareVar2
 >declareVar2 : any
->            : ^^^
 
 declare var declaredVar;
 >declaredVar : any
->            : ^^^
 
 declare var deckareVarWithType: number;
 >deckareVarWithType : number
@@ -212,7 +206,6 @@ export namespace m3 {
 
 export var eVar1, eVar2 = 10;
 >eVar1 : any
->      : ^^^
 >eVar2 : number
 >      : ^^^^^^
 >10 : 10
@@ -220,7 +213,6 @@ export var eVar1, eVar2 = 10;
 
 var eVar22;
 >eVar22 : any
->       : ^^^
 
 export var eVar3 = 10, eVar4, eVar5;
 >eVar3 : number
@@ -228,7 +220,5 @@ export var eVar3 = 10, eVar4, eVar5;
 >10 : 10
 >   : ^^
 >eVar4 : any
->      : ^^^
 >eVar5 : any
->      : ^^^
 
diff --git a/tests/baselines/reference/withImportDecl.errors.txt b/tests/baselines/reference/withImportDecl.errors.txt
deleted file mode 100644
index a587af11cfe88..0000000000000
--- a/tests/baselines/reference/withImportDecl.errors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-
-
-!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== withImportDecl_1.ts (0 errors) ====
-    ///<reference path='withImportDecl_0.ts'/>
-    var simpleVar;
-    
-    var anotherVar: any;
-    var varWithSimpleType: number;
-    var varWithArrayType: number[];
-    
-    var varWithInitialValue = 30;
-    
-    var withComplicatedValue = { x: 30, y: 70, desc: "position" };
-    
-    declare var declaredVar;
-    declare var declareVar2
-    
-    declare var declaredVar;
-    declare var deckareVarWithType: number;
-    
-    var arrayVar: string[] = ['a', 'b'];
-    
-    
-    function simpleFunction() {
-        return {
-            x: "Hello",
-            y: "word",
-            n: 2
-        };
-    }
-    
-    namespace m1 {
-        export function foo() {
-            return "Hello";
-        }
-    }
-    
-    import m3 = require("withImportDecl_0");
-    
-    var b = new m3.A();
-    b.foo;
-==== withImportDecl_0.ts (0 errors) ====
-    export class A { foo: string; }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types
index a7b711bd97eeb..f309e6c1297d1 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -4,11 +4,9 @@
 ///<reference path='withImportDecl_0.ts'/>
 var simpleVar;
 >simpleVar : any
->          : ^^^
 
 var anotherVar: any;
 >anotherVar : any
->           : ^^^
 
 var varWithSimpleType: number;
 >varWithSimpleType : number
@@ -44,15 +42,12 @@ var withComplicatedValue = { x: 30, y: 70, desc: "position" };
 
 declare var declaredVar;
 >declaredVar : any
->            : ^^^
 
 declare var declareVar2
 >declareVar2 : any
->            : ^^^
 
 declare var declaredVar;
 >declaredVar : any
->            : ^^^
 
 declare var deckareVarWithType: number;
 >deckareVarWithType : number
diff --git a/tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts b/tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts
index 853ae67b2439c..9c562917cdb07 100644
--- a/tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts
+++ b/tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 
 class D { }
 export = D;
diff --git a/tests/cases/compiler/augmentExportEquals1.ts b/tests/cases/compiler/augmentExportEquals1.ts
index d814bfdcc71b2..4479fd063b962 100644
--- a/tests/cases/compiler/augmentExportEquals1.ts
+++ b/tests/cases/compiler/augmentExportEquals1.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @filename: file1.ts
 var x = 1;
 export = x;
diff --git a/tests/cases/compiler/augmentExportEquals2.ts b/tests/cases/compiler/augmentExportEquals2.ts
index b037249645ac9..1d4c1fae35c61 100644
--- a/tests/cases/compiler/augmentExportEquals2.ts
+++ b/tests/cases/compiler/augmentExportEquals2.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 
 // @filename: file1.ts
 function foo() {}
diff --git a/tests/cases/compiler/augmentExportEquals3.ts b/tests/cases/compiler/augmentExportEquals3.ts
index e8585aba26d56..81a0e1d5448f2 100644
--- a/tests/cases/compiler/augmentExportEquals3.ts
+++ b/tests/cases/compiler/augmentExportEquals3.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 
 // @filename: file1.ts
 function foo() {}
diff --git a/tests/cases/compiler/augmentExportEquals4.ts b/tests/cases/compiler/augmentExportEquals4.ts
index 5e0f28ce963ed..85294682f5cc8 100644
--- a/tests/cases/compiler/augmentExportEquals4.ts
+++ b/tests/cases/compiler/augmentExportEquals4.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 
 // @filename: file1.ts
 class foo {}
diff --git a/tests/cases/compiler/augmentExportEquals5.ts b/tests/cases/compiler/augmentExportEquals5.ts
index 0b60538a7d6f6..4e3e7a5a2f4f8 100644
--- a/tests/cases/compiler/augmentExportEquals5.ts
+++ b/tests/cases/compiler/augmentExportEquals5.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 
 // @filename: express.d.ts
 
diff --git a/tests/cases/compiler/augmentExportEquals6.ts b/tests/cases/compiler/augmentExportEquals6.ts
index 4b10586779a64..a0dd50c53f0fd 100644
--- a/tests/cases/compiler/augmentExportEquals6.ts
+++ b/tests/cases/compiler/augmentExportEquals6.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 
 // @filename: file1.ts
 class foo {}
diff --git a/tests/cases/compiler/badExternalModuleReference.ts b/tests/cases/compiler/badExternalModuleReference.ts
index 2cb7f89468c59..9b1d367e528ef 100644
--- a/tests/cases/compiler/badExternalModuleReference.ts
+++ b/tests/cases/compiler/badExternalModuleReference.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 import a1 = require("garbage");
 export declare var a: {
     test1: a1.connectModule;
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
index 3590ab47a4031..48c68770620f7 100644
--- a/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
@@ -1,5 +1,5 @@
-// @target: esnext
-// @module: commonjs
+// @target: ES5
+// @module: amd
 if (true) {
     function foo() { }
     foo(); // ok
diff --git a/tests/cases/compiler/collisionExportsRequireAndAlias.ts b/tests/cases/compiler/collisionExportsRequireAndAlias.ts
index ccb4a6f63143e..b79da28f66bc3 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAlias.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAlias.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: collisionExportsRequireAndAlias_file1.ts
 export function bar() {
 }
@@ -7,8 +7,8 @@ export function bar() {
 export function bar2() {
 }
 // @Filename: collisionExportsRequireAndAlias_file2.ts
-import require = require('./collisionExportsRequireAndAlias_file1'); // Error
-import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error
+import require = require('collisionExportsRequireAndAlias_file1'); // Error
+import exports = require('collisionExportsRequireAndAlias_file3333'); // Error
 export function foo() {
     require.bar();
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
index 1e37befb2d7f6..ad703c2fddc0e 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 //@filename: collisionExportsRequireAndAmbientClass_externalmodule.ts
 export declare class require {
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
index e12815db674aa..c303a099b16ec 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 //@filename: collisionExportsRequireAndAmbientEnum_externalmodule.ts
 export declare enum require {
     _thisVal1,
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
index d10f67512a137..5b54298b5879d 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export declare function exports(): number;
 
 export declare function require(): string[];
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
index 41367e3bda5b6..cc37a4cf670e0 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 //@filename: collisionExportsRequireAndAmbientModule_externalmodule.ts
 export declare namespace require {
     export interface I {
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
index 4078d2497237d..25c98898c7277 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 //@filename: collisionExportsRequireAndAmbientVar_externalmodule.ts
 export declare var exports: number;
 export declare var require: string;
diff --git a/tests/cases/compiler/commentOnImportStatement1.ts b/tests/cases/compiler/commentOnImportStatement1.ts
index ab918149621e5..597509075b337 100644
--- a/tests/cases/compiler/commentOnImportStatement1.ts
+++ b/tests/cases/compiler/commentOnImportStatement1.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @removeComments: false
 /* Copyright */
 
diff --git a/tests/cases/compiler/commonSourceDir5.ts b/tests/cases/compiler/commonSourceDir5.ts
index 02e7a00e2643d..d21fa6ece08d6 100644
--- a/tests/cases/compiler/commonSourceDir5.ts
+++ b/tests/cases/compiler/commonSourceDir5.ts
@@ -1,5 +1,5 @@
 // @outFile: concat.js
-// @module: esnext
+// @module: amd
 // @moduleResolution: bundler
 // @Filename: A:/bar.ts
 import {z} from "./foo";
diff --git a/tests/cases/compiler/constDeclarations-access5.ts b/tests/cases/compiler/constDeclarations-access5.ts
index 769e72c266a76..1590d9289ef71 100644
--- a/tests/cases/compiler/constDeclarations-access5.ts
+++ b/tests/cases/compiler/constDeclarations-access5.ts
@@ -1,5 +1,5 @@
 // @target: ES6
-// @module: commonjs
+// @module: amd
 
 
 // @Filename: constDeclarations_access_1.ts
@@ -7,7 +7,7 @@ export const x = 0;
 
 // @Filename: constDeclarations_access_2.ts
 ///<reference path='constDeclarations_access_1.ts'/>
-import m = require('./constDeclarations_access_1');
+import m = require('constDeclarations_access_1');
 // Errors
 m.x = 1;
 m.x += 2;
diff --git a/tests/cases/compiler/copyrightWithNewLine1.ts b/tests/cases/compiler/copyrightWithNewLine1.ts
index 60a52f0b71101..e64242c4b6f42 100644
--- a/tests/cases/compiler/copyrightWithNewLine1.ts
+++ b/tests/cases/compiler/copyrightWithNewLine1.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 /*****************************
 * (c) Copyright - Important
 ****************************/
diff --git a/tests/cases/compiler/copyrightWithoutNewLine1.ts b/tests/cases/compiler/copyrightWithoutNewLine1.ts
index a7e794b545d09..6cd2c398b8a3f 100644
--- a/tests/cases/compiler/copyrightWithoutNewLine1.ts
+++ b/tests/cases/compiler/copyrightWithoutNewLine1.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 /*****************************
 * (c) Copyright - Important
 ****************************/
diff --git a/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts b/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
index a2062ef6bda75..80c0f8da3c45d 100644
--- a/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
+++ b/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
@@ -1,4 +1,4 @@
-//@module: esnext
+//@module: amd
 var nake;
 function doCompile<P0, P1, P2>(fileset: P0, moduleType: P1) {
 
diff --git a/tests/cases/compiler/duplicateLocalVariable2.ts b/tests/cases/compiler/duplicateLocalVariable2.ts
index 5c08541773af5..63c387e97d644 100644
--- a/tests/cases/compiler/duplicateLocalVariable2.ts
+++ b/tests/cases/compiler/duplicateLocalVariable2.ts
@@ -1,4 +1,4 @@
-//@module: esnext
+//@module: amd
 export class TestCase {
     constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) {
     }
diff --git a/tests/cases/compiler/duplicateSymbolsExportMatching.ts b/tests/cases/compiler/duplicateSymbolsExportMatching.ts
index 4d2eeaa9d0e62..1fbd5e2aea00e 100644
--- a/tests/cases/compiler/duplicateSymbolsExportMatching.ts
+++ b/tests/cases/compiler/duplicateSymbolsExportMatching.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 namespace M {
     export interface E { }
     interface I { }
diff --git a/tests/cases/compiler/emitHelpersWithLocalCollisions.ts b/tests/cases/compiler/emitHelpersWithLocalCollisions.ts
index 510cfa9d3ec6b..c10e037abc934 100644
--- a/tests/cases/compiler/emitHelpersWithLocalCollisions.ts
+++ b/tests/cases/compiler/emitHelpersWithLocalCollisions.ts
@@ -1,5 +1,6 @@
 // @target: es6
 // @module: *
+// @moduleResolution: classic
 // @experimentalDecorators: true
 // @filename: a.ts
 // @noTypesAndSymbols: true
diff --git a/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts b/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
index 5fbdba5571738..87acc67a59b31 100644
--- a/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
+++ b/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
@@ -2,6 +2,7 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
+// @moduleResolution: classic
 // @filename: external.ts
 export async function foo() {
 }
@@ -10,7 +11,7 @@ export async function foo() {
 async function foo() {
 }
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/cases/compiler/es5ModuleInternalNamedImports.ts b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
index 25d231247bfda..b527ec23c20a8 100644
--- a/tests/cases/compiler/es5ModuleInternalNamedImports.ts
+++ b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
@@ -1,5 +1,5 @@
 // @target: ES5
-// @module: commonjs
+// @module: AMD
 
 export namespace M {
     // variable
diff --git a/tests/cases/compiler/es6ExportAssignment2.ts b/tests/cases/compiler/es6ExportAssignment2.ts
index 0b06ddbdde103..b07427209f9f0 100644
--- a/tests/cases/compiler/es6ExportAssignment2.ts
+++ b/tests/cases/compiler/es6ExportAssignment2.ts
@@ -5,4 +5,4 @@ var a = 10;
 export = a;  // Error: export = not allowed in ES6
 
 // @filename: b.ts
-import * as a from "./a";
+import * as a from "a";
diff --git a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
index a88257901af15..07cae1c7da7f2 100644
--- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
+++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
@@ -14,8 +14,8 @@ export namespace uninstantiated {
 }
 
 // @filename: client.ts
-export { c } from "./server";
-export { c as c2 } from "./server";
-export { i, m as instantiatedModule } from "./server";
-export { uninstantiated } from "./server";
-export { x } from "./server";
\ No newline at end of file
+export { c } from "server";
+export { c as c2 } from "server";
+export { i, m as instantiatedModule } from "server";
+export { uninstantiated } from "server";
+export { x } from "server";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBinding.ts b/tests/cases/compiler/es6ImportDefaultBinding.ts
index 53d040f665953..2e68248d9ede5 100644
--- a/tests/cases/compiler/es6ImportDefaultBinding.ts
+++ b/tests/cases/compiler/es6ImportDefaultBinding.ts
@@ -7,6 +7,6 @@ var a = 10;
 export default a;
 
 // @filename: es6ImportDefaultBinding_1.ts
-import defaultBinding from "./es6ImportDefaultBinding_0";
+import defaultBinding from "es6ImportDefaultBinding_0";
 var x = defaultBinding;
-import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts
index fa262dfffd732..81f8c15320b94 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts
@@ -6,15 +6,15 @@ var a = 10;
 export default a;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamedImport1_1.ts
-import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding1;
-import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding2;
-import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding3;
-import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding4;
-import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding5;
-import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0";
+import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
 var x1: number = defaultBinding6;
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts
index 62d7977f3fe90..341a7c6c89676 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @declaration: true
 // @target: ES5
 
@@ -9,15 +9,15 @@ export var m = a;
 export default {};
 
 // @filename: client.ts
-export import defaultBinding1, { } from "./server";
-export import defaultBinding2, { a } from "./server";
+export import defaultBinding1, { } from "server";
+export import defaultBinding2, { a } from "server";
 export var x1: number = a;
-export import defaultBinding3, { a as b } from "./server";
+export import defaultBinding3, { a as b } from "server";
 export var x1: number = b;
-export import defaultBinding4, { x, a as y } from "./server";
+export import defaultBinding4, { x, a as y } from "server";
 export var x1: number = x;
 export var x1: number = y;
-export import defaultBinding5, { x as z,  } from "./server";
+export import defaultBinding5, { x as z,  } from "server";
 export var x1: number = z;
-export import defaultBinding6, { m,  } from "./server";
+export import defaultBinding6, { m,  } from "server";
 export var x1: number = m;
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts
index c3bbf20eaa229..e0f9d953afe62 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts
@@ -6,5 +6,5 @@
 export var a = 10;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts
index 112d81573e59b..dc75c522e9c27 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts
@@ -6,5 +6,5 @@ var a = 10;
 export default a;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts
-import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
+import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x: number = defaultBinding;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.ts
index 731843ca48b6e..e9f8c9e5a14e3 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.ts
@@ -7,5 +7,5 @@ var a = 10;
 export default a;
 
 // @filename: client.ts
-export import defaultBinding, * as nameSpaceBinding  from "./server";
+export import defaultBinding, * as nameSpaceBinding  from "server";
 export var x: number = defaultBinding;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.ts
index 8f8f1fe977093..80038a40ba27b 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.ts
@@ -7,5 +7,5 @@ class a { }
 export default a;
 
 // @filename: client.ts
-import defaultBinding, * as nameSpaceBinding from "./server";
+import defaultBinding, * as nameSpaceBinding from "server";
 export var x = new defaultBinding();
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingWithExport.ts b/tests/cases/compiler/es6ImportDefaultBindingWithExport.ts
index 016f7c670d56c..5bc98d15de94c 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingWithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingWithExport.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @declaration: true
 // @target: ES5
 
@@ -7,6 +7,6 @@ var a = 10;
 export default a;
 
 // @filename: client.ts
-export import defaultBinding from "./server";
+export import defaultBinding from "server";
 export var x = defaultBinding;
-export import defaultBinding2 from "./server"; // non referenced
\ No newline at end of file
+export import defaultBinding2 from "server"; // non referenced
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportEqualsDeclaration.ts b/tests/cases/compiler/es6ImportEqualsDeclaration.ts
index a777e39788f70..7df85a31d75cd 100644
--- a/tests/cases/compiler/es6ImportEqualsDeclaration.ts
+++ b/tests/cases/compiler/es6ImportEqualsDeclaration.ts
@@ -5,4 +5,4 @@ var a = 10;
 export = a;
 
 // @filename: client.ts
-import a = require("./server");
\ No newline at end of file
+import a = require("server");
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportParsingError.ts b/tests/cases/compiler/es6ImportNamedImportParsingError.ts
index 932cfd926efc9..26bd9b6915376 100644
--- a/tests/cases/compiler/es6ImportNamedImportParsingError.ts
+++ b/tests/cases/compiler/es6ImportNamedImportParsingError.ts
@@ -6,7 +6,7 @@ export var x = a;
 export var m = a;
 
 // @filename: es6ImportNamedImportParsingError_1.ts
-import { * } from "./es6ImportNamedImportParsingError_0";
-import defaultBinding, from "./es6ImportNamedImportParsingError_0";
-import , { a } from "./es6ImportNamedImportParsingError_0";
-import { a }, from "./es6ImportNamedImportParsingError_0";
\ No newline at end of file
+import { * } from "es6ImportNamedImportParsingError_0";
+import defaultBinding, from "es6ImportNamedImportParsingError_0";
+import , { a } from "es6ImportNamedImportParsingError_0";
+import { a }, from "es6ImportNamedImportParsingError_0";
\ No newline at end of file
diff --git a/tests/cases/compiler/exportDeclareClass1.ts b/tests/cases/compiler/exportDeclareClass1.ts
index 9230eda30aaed..c3acc5447b8ea 100644
--- a/tests/cases/compiler/exportDeclareClass1.ts
+++ b/tests/cases/compiler/exportDeclareClass1.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
     export declare class eaC {
         static tF() { };
         static tsF(param:any) { };
diff --git a/tests/cases/compiler/exportDefaultAsyncFunction2.ts b/tests/cases/compiler/exportDefaultAsyncFunction2.ts
index e96f091baa2dd..2d2ee4ef345e7 100644
--- a/tests/cases/compiler/exportDefaultAsyncFunction2.ts
+++ b/tests/cases/compiler/exportDefaultAsyncFunction2.ts
@@ -5,23 +5,23 @@ export function async<T>(...args: any[]): any { }
 export function await(...args: any[]): any { }
 
 // @filename: a.ts
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 export default async(() => await(Promise.resolve(1)));
 
 // @filename: b.ts
 export default async () => { return 0; };
 
 // @filename: c.ts
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 export default async<number>();
 
 // @filename: d.ts
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 
 export default async;
 
 // @filename: e.ts
-import { async, await } from './asyncawait';
+import { async, await } from 'asyncawait';
 
 export default async
 
diff --git a/tests/cases/compiler/exportEqualErrorType.ts b/tests/cases/compiler/exportEqualErrorType.ts
index 5adaffcbaee4d..d5195c411ac6d 100644
--- a/tests/cases/compiler/exportEqualErrorType.ts
+++ b/tests/cases/compiler/exportEqualErrorType.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: exportEqualErrorType_0.ts
 namespace server {
     export interface connectModule {
@@ -16,5 +16,5 @@ export = server;
  
 // @Filename: exportEqualErrorType_1.ts
 ///<reference path='exportEqualErrorType_0.ts'/>
-import connect = require('./exportEqualErrorType_0');
+import connect = require('exportEqualErrorType_0');
 connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
diff --git a/tests/cases/compiler/exportSameNameFuncVar.ts b/tests/cases/compiler/exportSameNameFuncVar.ts
index 33140bf874ef1..f026da43aa0e3 100644
--- a/tests/cases/compiler/exportSameNameFuncVar.ts
+++ b/tests/cases/compiler/exportSameNameFuncVar.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export var a = 10;
 export function a() {
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/exportedBlockScopedDeclarations.ts b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
index 54f43adfe75bf..f7a0216e8bee5 100644
--- a/tests/cases/compiler/exportedBlockScopedDeclarations.ts
+++ b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
@@ -1,4 +1,4 @@
-// @module: esnext
+// @module: amd
 const foo = foo; // compile error
 export const bar = bar; // should be compile error
 function f() {
diff --git a/tests/cases/compiler/fieldAndGetterWithSameName.ts b/tests/cases/compiler/fieldAndGetterWithSameName.ts
index c488187ec76b0..598f34c436ed4 100644
--- a/tests/cases/compiler/fieldAndGetterWithSameName.ts
+++ b/tests/cases/compiler/fieldAndGetterWithSameName.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export class C {
     x: number;
   get x(): number { return 1; }
diff --git a/tests/cases/compiler/genericMemberFunction.ts b/tests/cases/compiler/genericMemberFunction.ts
index f05c2928ea119..97c65c0d9d3df 100644
--- a/tests/cases/compiler/genericMemberFunction.ts
+++ b/tests/cases/compiler/genericMemberFunction.ts
@@ -1,4 +1,4 @@
-//@module: esnext
+//@module: amd
 export class BuildError<A, B, C>{
   public parent<A, B extends A, C>(): FileWithErrors<A, B, C> {
     return undefined;
diff --git a/tests/cases/compiler/genericReturnTypeFromGetter1.ts b/tests/cases/compiler/genericReturnTypeFromGetter1.ts
index 547ccbf3e8a0d..b1c869e6852d4 100644
--- a/tests/cases/compiler/genericReturnTypeFromGetter1.ts
+++ b/tests/cases/compiler/genericReturnTypeFromGetter1.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export interface A<T> {
    new (dbSet: DbSet<T>): T;
 }
diff --git a/tests/cases/compiler/giant.ts b/tests/cases/compiler/giant.ts
index a7087654ec0d0..f88c914ca8114 100644
--- a/tests/cases/compiler/giant.ts
+++ b/tests/cases/compiler/giant.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @declaration: true
 
 /*
diff --git a/tests/cases/compiler/importDeclWithClassModifiers.ts b/tests/cases/compiler/importDeclWithClassModifiers.ts
index da35704f3577b..2a5f92d5a30a8 100644
--- a/tests/cases/compiler/importDeclWithClassModifiers.ts
+++ b/tests/cases/compiler/importDeclWithClassModifiers.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 namespace x {
     interface c {
     }
diff --git a/tests/cases/compiler/importHelpers.ts b/tests/cases/compiler/importHelpers.ts
index 319d7815f7e6c..becbc2eb715d0 100644
--- a/tests/cases/compiler/importHelpers.ts
+++ b/tests/cases/compiler/importHelpers.ts
@@ -1,6 +1,7 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
+// @moduleResolution: classic
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
 // @filename: external.ts
@@ -39,7 +40,7 @@ function id<T>(x: T) {
 
 const result = id`hello world`;
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/cases/compiler/importHelpersDeclarations.ts b/tests/cases/compiler/importHelpersDeclarations.ts
index 943a412f162e6..7b958cda78901 100644
--- a/tests/cases/compiler/importHelpersDeclarations.ts
+++ b/tests/cases/compiler/importHelpersDeclarations.ts
@@ -1,6 +1,7 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
+// @moduleResolution: classic
 // @filename: declaration.d.ts
 export declare class D {
 }
diff --git a/tests/cases/compiler/importHelpersInIsolatedModules.ts b/tests/cases/compiler/importHelpersInIsolatedModules.ts
index c954dd466f98f..4c1dfd06ec082 100644
--- a/tests/cases/compiler/importHelpersInIsolatedModules.ts
+++ b/tests/cases/compiler/importHelpersInIsolatedModules.ts
@@ -2,6 +2,7 @@
 // @isolatedModules: true
 // @target: es5
 // @module: commonjs
+// @moduleResolution: classic
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
 // @filename: external.ts
@@ -28,7 +29,7 @@ class C {
     }
 }
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/cases/compiler/importHelpersInTsx.tsx b/tests/cases/compiler/importHelpersInTsx.tsx
index 82b1fabc45108..32e0e5bf3a0c0 100644
--- a/tests/cases/compiler/importHelpersInTsx.tsx
+++ b/tests/cases/compiler/importHelpersInTsx.tsx
@@ -1,6 +1,7 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
+// @moduleResolution: classic
 // @jsx: react
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
@@ -14,7 +15,7 @@ declare var React: any;
 declare var o: any;
 const x = <span {...o} />
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 export declare function __extends(d: Function, b: Function): void;
 export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
diff --git a/tests/cases/compiler/importHelpersWithLocalCollisions.ts b/tests/cases/compiler/importHelpersWithLocalCollisions.ts
index 3994e1bb03054..30e67ca069be7 100644
--- a/tests/cases/compiler/importHelpersWithLocalCollisions.ts
+++ b/tests/cases/compiler/importHelpersWithLocalCollisions.ts
@@ -1,6 +1,7 @@
 // @importHelpers: true
 // @target: es6
 // @module: commonjs, system, amd, es2015
+// @moduleResolution: classic
 // @experimentalDecorators: true
 // @filename: a.ts
 // @noTypesAndSymbols: true
@@ -12,7 +13,7 @@ declare var dec: any, __decorate: any;
 const o = { a: 1 };
 const y = { ...o };
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 export declare function __extends(d: Function, b: Function): void;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
diff --git a/tests/cases/compiler/interfaceDeclaration3.ts b/tests/cases/compiler/interfaceDeclaration3.ts
index 4fd57c9405f98..6dd9e787e3e20 100644
--- a/tests/cases/compiler/interfaceDeclaration3.ts
+++ b/tests/cases/compiler/interfaceDeclaration3.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 interface I1 { item:number; }
 
 namespace M1 {
diff --git a/tests/cases/compiler/interfaceImplementation6.ts b/tests/cases/compiler/interfaceImplementation6.ts
index 1b36ab08b4144..5d8bfdb329aea 100644
--- a/tests/cases/compiler/interfaceImplementation6.ts
+++ b/tests/cases/compiler/interfaceImplementation6.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 interface I1 {
     item:number;
 }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
index 48d34ff1e68dc..fb1764a7ca241 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export namespace a {
     export interface I {
     }
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
index 6a091f2208b84..39b5a8ec24654 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export namespace a {
     export namespace b {
         export interface I {
diff --git a/tests/cases/compiler/jsxClassAttributeResolution.tsx b/tests/cases/compiler/jsxClassAttributeResolution.tsx
index 527741ac77675..32263ecd794ee 100644
--- a/tests/cases/compiler/jsxClassAttributeResolution.tsx
+++ b/tests/cases/compiler/jsxClassAttributeResolution.tsx
@@ -8,7 +8,7 @@ export const a = <App></App>;
     "name": "@types/react",
     "version": "0.0.1",
     "main": "",
-    "types": "index.d.ts"
+    "types": "index.d.ts",
 }
 // @filename: node_modules/@types/react/index.d.ts
 interface IntrinsicClassAttributesAlias<T> {
diff --git a/tests/cases/compiler/moduleAugmentationGlobal8.ts b/tests/cases/compiler/moduleAugmentationGlobal8.ts
index 5c00c49a8bf46..e28b07d6bfd7a 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal8.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal8.ts
@@ -1,5 +1,5 @@
 // @target: es5
-// @module: esnext
+// @module: amd
 namespace A {
     declare global {
         interface Array<T> { x }
diff --git a/tests/cases/compiler/moduleAugmentationGlobal8_1.ts b/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
index e4900a9be4c5e..9031e4742b083 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
@@ -1,5 +1,5 @@
 // @target: es5
-// @module: esnext
+// @module: amd
 namespace A {
     global {
         interface Array<T> { x }
diff --git a/tests/cases/compiler/moduleExports1.ts b/tests/cases/compiler/moduleExports1.ts
index c118c13721b36..049988b7af6b2 100644
--- a/tests/cases/compiler/moduleExports1.ts
+++ b/tests/cases/compiler/moduleExports1.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 export namespace TypeScript.Strasse.Street {
 	export class Rue {
 		public address:string;
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
index 8a90fd5fed4a8..f663871cbdb36 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 //@declaration: true
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts
@@ -34,8 +34,8 @@ declare module 'm2' {
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
-import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
-import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
 
 // Usage of privacy error imports
 var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
diff --git a/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts b/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
index d215069686965..c127c3ee7866d 100644
--- a/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
+++ b/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: propertyIdentityWithPrivacyMismatch_0.ts
 declare module 'mod1' {
     class Foo {
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts
index 8823d43a02fd4..1b28dbf22f7ab 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts
 declare module "moduleC" {
     import self = require("moduleC");
@@ -12,5 +12,5 @@ export = ClassB;
 // @Filename: recursiveExportAssignmentAndFindAliasedType1_moduleA.ts
 /// <reference path="recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts"/>
 import moduleC = require("moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType1_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts
index 55dd02da674a6..32b76ecc55114 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts
 declare module "moduleC" {
     import self = require("moduleD");
@@ -16,5 +16,5 @@ export = ClassB;
 // @Filename: recursiveExportAssignmentAndFindAliasedType2_moduleA.ts
 /// <reference path="recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts"/>
 import moduleC = require("moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType2_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts
index bbf5d73db87eb..bdaaecee25b6b 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts
 declare module "moduleC" {
     import self = require("moduleD");
@@ -20,5 +20,5 @@ export = ClassB;
 // @Filename: recursiveExportAssignmentAndFindAliasedType3_moduleA.ts
 /// <reference path="recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts"/>
 import moduleC = require("moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType3_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts
index 2e7398dc02a56..70536b9b8a2ca 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts
@@ -1,6 +1,6 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType4_moduleC.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType4_moduleB.ts
@@ -8,6 +8,6 @@ class ClassB { }
 export = ClassB;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType4_moduleA.ts
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts
index faa1129fd696a..e66f23f2ba10a 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts
@@ -1,10 +1,10 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType5_moduleC.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleD");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType5_moduleD.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType5_moduleB.ts
@@ -12,6 +12,6 @@ class ClassB { }
 export = ClassB;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType5_moduleA.ts
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType5_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts
index 54f1c79e4c94a..7a1a819521679 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts
@@ -1,14 +1,14 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType6_moduleC.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleD");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType6_moduleD.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleE");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType6_moduleE.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType6_moduleB.ts
@@ -16,6 +16,6 @@ class ClassB { }
 export = ClassB;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType6_moduleA.ts
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType6_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
index b6eeaf94687d6..34e7e5f839279 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
@@ -1,15 +1,15 @@
-//@module: commonjs
+//@module: amd
 // @Filename: recursiveExportAssignmentAndFindAliasedType7_moduleC.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
 var selfVar = self;
 export = selfVar;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType7_moduleD.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleE");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType7_moduleE.ts
-import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
 export = self;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType7_moduleB.ts
@@ -17,6 +17,6 @@ class ClassB { }
 export = ClassB;
 
 // @Filename: recursiveExportAssignmentAndFindAliasedType7_moduleA.ts
-import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
-import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB");
+import moduleC = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
+import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
 export var b: ClassB; // This should result in type ClassB
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadUnionPropOverride.ts b/tests/cases/compiler/spreadUnionPropOverride.ts
deleted file mode 100644
index ab1c05a30cbfc..0000000000000
--- a/tests/cases/compiler/spreadUnionPropOverride.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// @strict: true
-
-// Repro from #62655
-type Thing = {
-    id: string;
-    label: string;
-};
-
-const things: Thing[] = [];
-
-function find(id: string): undefined | Thing {
-    return things.find(thing => thing.id === id);
-}
-
-declare function fun(thing: Thing): void;
-
-fun({
-    id: 'foo',
-    ...find('foo') ?? {
-        label: 'Foo',
-    },
-});
-
-// Should not error when spreading a union where one type doesn't have the property
-const obj1 = {
-    x: 1,
-    ...(Math.random() > 0.5 ? { y: 2 } : { y: 2, x: 3 }),
-}; // OK - x might be overwritten
-
-// Should error when the property is in all constituents
-const obj2 = {
-    x: 1,
-    ...(Math.random() > 0.5 ? { x: 2, y: 3 } : { x: 4, z: 5 }),
-}; // Error - x is always overwritten
-
-// Should not error with optional property in union
-type Partial1 = { a: string; b?: number };
-type Partial2 = { a: string; c: boolean };
-declare const partial: Partial1 | Partial2;
-
-const obj3 = {
-    b: 42,
-    ...partial,
-}; // OK - b is optional in Partial1 and missing in Partial2
-
-// Should error when property is required in all types
-const obj4 = {
-    a: "test",
-    ...partial,
-}; // Error - a is required in both types
-
-// More complex union case
-type A = { id: string; name: string };
-type B = { name: string; age: number };
-type C = { name: string };
-
-declare const abc: A | B | C;
-
-const obj5 = {
-    id: "123",
-    ...abc,
-}; // OK - id is only in A
-
-const obj6 = {
-    name: "test",
-    ...abc,
-}; // Error - name is in all types
diff --git a/tests/cases/compiler/staticInstanceResolution5.ts b/tests/cases/compiler/staticInstanceResolution5.ts
index c2cd884bf1af7..ed34dbd535f27 100644
--- a/tests/cases/compiler/staticInstanceResolution5.ts
+++ b/tests/cases/compiler/staticInstanceResolution5.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 // @Filename: staticInstanceResolution5_0.ts
 export class Promise {
     static timeout(delay: number): Promise {
@@ -7,7 +7,7 @@ export class Promise {
 }
 
 // @Filename: staticInstanceResolution5_1.ts
-import WinJS = require('./staticInstanceResolution5_0');
+import WinJS = require('staticInstanceResolution5_0');
 
 // these 3 should be errors
 var x = (w1: WinJS) => { };
diff --git a/tests/cases/compiler/topLevelLambda4.ts b/tests/cases/compiler/topLevelLambda4.ts
index badf43d900a61..306349454c6f5 100644
--- a/tests/cases/compiler/topLevelLambda4.ts
+++ b/tests/cases/compiler/topLevelLambda4.ts
@@ -1,2 +1,2 @@
-//@module: esnext
+//@module: amd
 export var x = () => this.window;
\ No newline at end of file
diff --git a/tests/cases/compiler/typeAliasDeclarationEmit.ts b/tests/cases/compiler/typeAliasDeclarationEmit.ts
index 205a703ae7f0b..be7e40453f60d 100644
--- a/tests/cases/compiler/typeAliasDeclarationEmit.ts
+++ b/tests/cases/compiler/typeAliasDeclarationEmit.ts
@@ -1,5 +1,5 @@
 // @target: ES5
-// @module: commonjs
+// @module: AMD
 // @declaration: true
 
 export type callback<T> = () => T;
diff --git a/tests/cases/compiler/typeUsedAsValueError2.ts b/tests/cases/compiler/typeUsedAsValueError2.ts
index 1e8c389694489..dd89225ef96e0 100644
--- a/tests/cases/compiler/typeUsedAsValueError2.ts
+++ b/tests/cases/compiler/typeUsedAsValueError2.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @filename: helloInterface.ts
 interface HelloInterface {
     world: any;
@@ -14,8 +14,8 @@ namespace HelloNamespace {
 export = HelloNamespace;
 
 // @filename: world.ts
-import HelloInterface = require("./helloInterface");
-import HelloNamespace = require("./helloNamespace");
+import HelloInterface = require("helloInterface");
+import HelloNamespace = require("helloNamespace");
 
 HelloInterface.world;
 HelloNamespace.world;
\ No newline at end of file
diff --git a/tests/cases/compiler/undeclaredModuleError.ts b/tests/cases/compiler/undeclaredModuleError.ts
index 5a78e48b411a9..98b54e41c5a0b 100644
--- a/tests/cases/compiler/undeclaredModuleError.ts
+++ b/tests/cases/compiler/undeclaredModuleError.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+//@module: amd
 import fs = require('fs');
 function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {}
 
diff --git a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts
index f45f4549fbf74..027dc4d300869 100644
--- a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts
+++ b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts
@@ -1,2 +1,2 @@
-//@module: commonjs
+//@module: amd
 export declare module "M" { }
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameEmitHelpers.ts b/tests/cases/conformance/classes/members/privateNames/privateNameEmitHelpers.ts
index 6fb0df2290110..82dc5693d42ba 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameEmitHelpers.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameEmitHelpers.ts
@@ -10,7 +10,7 @@ export class C {
     set #c(v: number) { this.#a += v; }
 }
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameStaticEmitHelpers.ts b/tests/cases/conformance/classes/members/privateNames/privateNameStaticEmitHelpers.ts
index 1d59a8164faa1..b1261a039e563 100644
--- a/tests/cases/conformance/classes/members/privateNames/privateNameStaticEmitHelpers.ts
+++ b/tests/cases/conformance/classes/members/privateNames/privateNameStaticEmitHelpers.ts
@@ -10,7 +10,7 @@ export class S {
     static get #c() { return S.#b(); }
 }
 
-// @filename: node_modules/tslib/index.d.ts
+// @filename: tslib.d.ts
 // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields
 export declare function __classPrivateFieldGet<T extends object, V>(receiver: T, state: any): V;
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts b/tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts
deleted file mode 100644
index 71fc65e34a036..0000000000000
--- a/tests/cases/conformance/decorators/invalid/decoratorOnAwait.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare function dec<T>(target: T): T;
-
-@dec
-await 1
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts b/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts
deleted file mode 100644
index 815da8de4de27..0000000000000
--- a/tests/cases/conformance/decorators/invalid/decoratorOnUsing.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// @target: esnext
-declare function dec<T>(target: T): T;
-
-@dec
-using 1
-
-@dec
-using x
diff --git a/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts b/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts
index 1106f396f3eef..9c9ee883fd9ca 100644
--- a/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts
+++ b/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @Filename: foo_0.ts
 export enum E1 {
 	A,B,C
diff --git a/tests/cases/conformance/externalModules/importNonExternalModule.ts b/tests/cases/conformance/externalModules/importNonExternalModule.ts
index 28f82ee789991..c0df030aa941e 100644
--- a/tests/cases/conformance/externalModules/importNonExternalModule.ts
+++ b/tests/cases/conformance/externalModules/importNonExternalModule.ts
@@ -1,4 +1,4 @@
-// @module: commonjs
+// @module: amd
 // @Filename: foo_0.ts
 namespace foo {
 	export var answer = 42;
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
index c200b17ef3598..8bbf3142e1995 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
@@ -1,5 +1,5 @@
 // @target: esnext
-// @module: commonjs
+// @module: system
 
 // @filename: index.ts
 // await disallowed in import=
diff --git a/tests/cases/conformance/importDefer/importDeferInvalidDefault.ts b/tests/cases/conformance/importDefer/importDeferInvalidDefault.ts
index ba6972e84899f..d3f02c8d13926 100644
--- a/tests/cases/conformance/importDefer/importDeferInvalidDefault.ts
+++ b/tests/cases/conformance/importDefer/importDeferInvalidDefault.ts
@@ -6,6 +6,6 @@ export default function foo() {
 }
 
 // @filename: b.ts
-import defer foo from "./a";
+import defer foo from "a";
 
 foo();
\ No newline at end of file
diff --git a/tests/cases/conformance/importDefer/importDeferInvalidNamed.ts b/tests/cases/conformance/importDefer/importDeferInvalidNamed.ts
index a1b3a006fa7f5..078f5a132223f 100644
--- a/tests/cases/conformance/importDefer/importDeferInvalidNamed.ts
+++ b/tests/cases/conformance/importDefer/importDeferInvalidNamed.ts
@@ -5,6 +5,6 @@ export function foo() {
 }
 
 // @filename: b.ts
-import defer { foo } from "./a";
+import defer { foo } from "a";
 
 foo();
\ No newline at end of file
diff --git a/tests/cases/conformance/importDefer/importDeferTypeConflict1.ts b/tests/cases/conformance/importDefer/importDeferTypeConflict1.ts
index 788c94f759701..5cf5ef7c544ae 100644
--- a/tests/cases/conformance/importDefer/importDeferTypeConflict1.ts
+++ b/tests/cases/conformance/importDefer/importDeferTypeConflict1.ts
@@ -5,4 +5,4 @@ export function foo() {
 }
 
 // @filename: b.ts
-import type defer * as ns1 from "./a";
+import type defer * as ns1 from "a";
diff --git a/tests/cases/conformance/importDefer/importDeferTypeConflict2.ts b/tests/cases/conformance/importDefer/importDeferTypeConflict2.ts
index 9c7a38771bb9b..a12aa3529e3a3 100644
--- a/tests/cases/conformance/importDefer/importDeferTypeConflict2.ts
+++ b/tests/cases/conformance/importDefer/importDeferTypeConflict2.ts
@@ -5,4 +5,4 @@ export function foo() {
 }
 
 // @filename: b.ts
-import defer type * as ns1 from "./a";
+import defer type * as ns1 from "a";
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution10.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution10.tsx
index 3dbab6f161798..2b04a9a80d9b4 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution10.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution10.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: commonjs
+//@module: amd
 
 //@filename: react.d.ts
 declare namespace JSX {
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx
index 199f5172f60f5..b918c3b11223f 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: commonjs
+//@module: amd
 
 //@filename: react.d.ts
 declare namespace JSX {
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx
index 9200d0584f8b2..8069e4811effe 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: commonjs
+//@module: amd
 
 //@filename: react.d.ts
 declare namespace JSX {
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx
index 2ec0b1732b11c..b2b1d51d69b34 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: commonjs
+//@module: amd
 
 //@filename: react.d.ts
 declare namespace JSX {
diff --git a/tests/cases/conformance/jsx/tsxElementResolution19.tsx b/tests/cases/conformance/jsx/tsxElementResolution19.tsx
index 77bd17c0a9faa..ae4fb5baf1ba3 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution19.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution19.tsx
@@ -1,5 +1,5 @@
 //@jsx: react
-//@module: commonjs
+//@module: amd
 
 //@filename: react.d.ts
 declare module "react" {
diff --git a/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx b/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
index e8733600f0457..b2b6f101cbbee 100644
--- a/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
+++ b/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
@@ -1,6 +1,6 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @module: commonjs
+// @module: amd
 // @noLib: true
 // @strictNullChecks: true
 // @skipLibCheck: true
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
index 79855c7279138..d5c247aa22412 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
@@ -1,6 +1,6 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @module: commonjs
+// @module: amd
 // @noLib: true
 // @skipLibCheck: true
 // @libFiles: react.d.ts,lib.d.ts
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx
index 61d2297ccd6e0..b32393c44ceb4 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx
@@ -1,6 +1,6 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @module: commonjs
+// @module: amd
 // @noLib: true
 // @skipLibCheck: true
 // @libFiles: react.d.ts,lib.d.ts
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx
index 5cee1a4b79645..eb8f3f3d12890 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx
@@ -1,6 +1,6 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @module: commonjs
+// @module: amd
 // @noLib: true
 // @skipLibCheck: true
 // @libFiles: react.d.ts,lib.d.ts
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx
index 6982dbc7a0280..6cd88999425b3 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx
@@ -1,6 +1,6 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @module: commonjs
+// @module: amd
 // @noLib: true
 // @skipLibCheck: true
 // @libFiles: react.d.ts,lib.d.ts
diff --git a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
index ca309d23a1255..53171833d9def 100644
--- a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
+++ b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
@@ -1,6 +1,6 @@
 // @filename: file.tsx
 // @jsx: preserve
-// @module: commonjs
+// @module: amd
 // @noLib: true
 // @skipLibCheck: true
 // @libFiles: react.d.ts,lib.d.ts
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import3.ts b/tests/cases/fourslash/codeFixCalledES2015Import3.ts
index c07a80e83e337..c9eb402c800c5 100644
--- a/tests/cases/fourslash/codeFixCalledES2015Import3.ts
+++ b/tests/cases/fourslash/codeFixCalledES2015Import3.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
-
+// @esModuleInterop: true
+// @module: amd
 // @Filename: foo.d.ts
 ////declare function foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import6.ts b/tests/cases/fourslash/codeFixCalledES2015Import6.ts
index c71b6d3230dba..b741831bce96b 100644
--- a/tests/cases/fourslash/codeFixCalledES2015Import6.ts
+++ b/tests/cases/fourslash/codeFixCalledES2015Import6.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
-
+// @esModuleInterop: true
+// @module: amd
 // @Filename: foo.d.ts
 ////declare function foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixCalledES2015Import9.ts b/tests/cases/fourslash/codeFixCalledES2015Import9.ts
index 02f4334462668..1ce110f056a0b 100644
--- a/tests/cases/fourslash/codeFixCalledES2015Import9.ts
+++ b/tests/cases/fourslash/codeFixCalledES2015Import9.ts
@@ -1,5 +1,6 @@
 /// <reference path='fourslash.ts' />
-
+// @esModuleInterop: true
+// @module: amd
 // @Filename: foo.d.ts
 ////declare class foo(): void;
 ////declare namespace foo {}
diff --git a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports47.ts b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports47.ts
index e2bbfe9b840bb..7cb1d83a0e01c 100644
--- a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports47.ts
+++ b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports47.ts
@@ -9,7 +9,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts"
+////    "types": "index.d.ts",
 ////}
 
 // @filename: node_modules/react/index.d.ts
diff --git a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports48.ts b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports48.ts
index 77f10ff0548f7..4d1a33fe565e6 100644
--- a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports48.ts
+++ b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports48.ts
@@ -9,7 +9,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts"
+////    "types": "index.d.ts",
 ////}
 
 // @filename: node_modules/react/index.d.ts
diff --git a/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts b/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
index 15be4d24678a2..34e81ae9c909e 100644
--- a/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
+++ b/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
@@ -1,4 +1,5 @@
 ///<reference path="fourslash.ts" />
+// @ModuleResolution: classic
 
 // @Filename: A.ts
 ////export interface I1 { one: number }
@@ -24,11 +25,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "./A";
-////export * from "./B"
+////export * from "A";
+////export * from "B"
 
 // @Filename: D.ts
-////import * as c from "./C";
+////import * as c from "C";
 ////var x: c.Inner./**/
 
 verify.completions({ marker: "", exact: "I3" });
diff --git a/tests/cases/fourslash/completionListInImportClause01.ts b/tests/cases/fourslash/completionListInImportClause01.ts
index 999d8323746de..48ed52ae51517 100644
--- a/tests/cases/fourslash/completionListInImportClause01.ts
+++ b/tests/cases/fourslash/completionListInImportClause01.ts
@@ -1,18 +1,20 @@
 /// <reference path='fourslash.ts'/>
 
+// @ModuleResolution: classic
+
 // @Filename: m1.ts
 ////export var foo: number = 1;
 ////export function bar() { return 10; }
 ////export function baz() { return 10; }
 
 // @Filename: m2.ts
-////import {/*1*/, /*2*/ from "./m1"
-////import {/*3*/} from "./m1"
-////import {foo,/*4*/ from "./m1"
-////import {bar as /*5*/, /*6*/ from "./m1"
-////import {foo, bar, baz as b,/*7*/} from "./m1"
-////import { type /*8*/ } from "./m1";
-////import { type b/*9*/ } from "./m1";
+////import {/*1*/, /*2*/ from "m1"
+////import {/*3*/} from "m1"
+////import {foo,/*4*/ from "m1"
+////import {bar as /*5*/, /*6*/ from "m1"
+////import {foo, bar, baz as b,/*7*/} from "m1"
+////import { type /*8*/ } from "m1";
+////import { type b/*9*/ } from "m1";
 
 const type = { name: "type", sortText: completion.SortText.GlobalsOrKeywords };
 
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
index a8874a0accecd..85d45299f3694 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
@@ -1,4 +1,3 @@
-/// <reference path="fourslash.ts" />
 // @module: esnext
 
 // @Filename: /a.ts
@@ -10,7 +9,7 @@
 
 verify.completions({
     marker: "",
-    includes: { name: "exportedConstant", source: "./a", hasAction: true, sortText: completion.SortText.AutoImportSuggestions }, 
+    includes: { name: "exportedConstant", source: "/a", hasAction: true, sortText: completion.SortText.AutoImportSuggestions }, 
     isNewIdentifierLocation: true,
     preferences: { includeCompletionsForModuleExports: true },
 });
diff --git a/tests/cases/fourslash/completionsImportBaseUrl.ts b/tests/cases/fourslash/completionsImportBaseUrl.ts
index 6aa071d3ca508..5f67a7d4d6301 100644
--- a/tests/cases/fourslash/completionsImportBaseUrl.ts
+++ b/tests/cases/fourslash/completionsImportBaseUrl.ts
@@ -19,7 +19,7 @@ verify.completions({
     marker: "",
     includes: {
         name: "foo",
-        source: "./a",
+        source: "/src/a",
         sourceDisplay: "./a",
         text: "const foo: 0",
         kind: "const",
diff --git a/tests/cases/fourslash/completionsImport_default_anonymous.ts b/tests/cases/fourslash/completionsImport_default_anonymous.ts
index 568b1fb5e9026..a7a2ffad06fef 100644
--- a/tests/cases/fourslash/completionsImport_default_anonymous.ts
+++ b/tests/cases/fourslash/completionsImport_default_anonymous.ts
@@ -23,7 +23,7 @@ verify.completions(
         marker: "1",
         includes: {
             name: "fooBar",
-            source: "./foo-bar",
+            source: "/src/foo-bar",
             sourceDisplay: "./foo-bar",
             text: "(property) default: 0",
             kind: "property",
@@ -36,7 +36,7 @@ verify.completions(
 );
 verify.applyCodeActionFromCompletion("1", {
     name: "fooBar",
-    source: "./foo-bar",
+    source: "/src/foo-bar",
     description: `Add import from "./foo-bar"`,
     newFileContent: `import fooBar from "./foo-bar"
 
diff --git a/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts b/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts
index 18c877f6a0ee8..3459a342d10fb 100644
--- a/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts
+++ b/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts
@@ -12,7 +12,7 @@ verify.completions({
     marker: "",
     includes: {
         name: "foo",
-        source: "./a",
+        source: "/a",
         sourceDisplay: "./a",
         text: "function foo(): void",
         kind: "function",
@@ -24,7 +24,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./a",
+    source: "/a",
     description: `Add import from "./a"`,
     newFileContent: `import foo from "./a";
 
diff --git a/tests/cases/fourslash/completionsImport_default_exportDefaultIdentifier.ts b/tests/cases/fourslash/completionsImport_default_exportDefaultIdentifier.ts
index dd91eea6ca853..f4db7061043b7 100644
--- a/tests/cases/fourslash/completionsImport_default_exportDefaultIdentifier.ts
+++ b/tests/cases/fourslash/completionsImport_default_exportDefaultIdentifier.ts
@@ -16,7 +16,7 @@ verify.completions({
     marker: "",
     includes: {
         name: "foo",
-        source: "./a",
+        source: "/a",
         sourceDisplay: "./a",
         text: "(alias) const foo: 0\nexport default foo",
         kind: "alias",
@@ -29,7 +29,7 @@ verify.completions({
 
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./a",
+    source: "/a",
     description: `Add import from "./a"`,
     newFileContent: `import foo from "./a";
 
diff --git a/tests/cases/fourslash/completionsImport_exportEquals_anonymous.ts b/tests/cases/fourslash/completionsImport_exportEquals_anonymous.ts
index 069e27736c190..436549ee6b14b 100644
--- a/tests/cases/fourslash/completionsImport_exportEquals_anonymous.ts
+++ b/tests/cases/fourslash/completionsImport_exportEquals_anonymous.ts
@@ -37,7 +37,7 @@ verify.completions(
         preferences
     }
 );
-verify.applyCodeActionFromCompletion("1", {
+verify.applyCodeActionFromCompletion("0", {
     name: "fooBar",
     source: "./foo-bar",
     description: `Add import from "./foo-bar"`,
diff --git a/tests/cases/fourslash/completionsImport_matching.ts b/tests/cases/fourslash/completionsImport_matching.ts
index 4b48eaa86a962..e2227319a8e49 100644
--- a/tests/cases/fourslash/completionsImport_matching.ts
+++ b/tests/cases/fourslash/completionsImport_matching.ts
@@ -21,7 +21,7 @@ verify.completions({
     includes: ["aBcdef", "a_bcdef", "BDF"].map(name =>
         ({
             name,
-            source: "./a",
+            source: "/a",
             text: `function ${name}(): void`,
             hasAction: true,
             kind: "function",
diff --git a/tests/cases/fourslash/completionsImport_multipleWithSameName.ts b/tests/cases/fourslash/completionsImport_multipleWithSameName.ts
index a54e6a14503b2..d7433b41492db 100644
--- a/tests/cases/fourslash/completionsImport_multipleWithSameName.ts
+++ b/tests/cases/fourslash/completionsImport_multipleWithSameName.ts
@@ -29,7 +29,7 @@ verify.completions({
         },
         {
             name: "foo",
-            source: "./a",
+            source: "/a",
             sourceDisplay: "./a",
             text: "const foo: 0",
             kind: "const",
@@ -39,7 +39,7 @@ verify.completions({
         },
         {
             name: "foo",
-            source: "./b",
+            source: "/b",
             sourceDisplay: "./b",
             text: "const foo: 1",
             kind: "const",
@@ -52,7 +52,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./b",
+    source: "/b",
     description: `Add import from "./b"`,
     newFileContent: `import { foo } from "./b";
 
diff --git a/tests/cases/fourslash/completionsImport_named_exportEqualsNamespace.ts b/tests/cases/fourslash/completionsImport_named_exportEqualsNamespace.ts
index be1edc1650fb4..d4566dd5dfcf9 100644
--- a/tests/cases/fourslash/completionsImport_named_exportEqualsNamespace.ts
+++ b/tests/cases/fourslash/completionsImport_named_exportEqualsNamespace.ts
@@ -15,7 +15,7 @@ verify.completions({
     marker: "",
     includes: {
         name: "foo",
-        source: "./a",
+        source: "/a",
         sourceDisplay: "./a",
         text: "const N.foo: 0",
         kind: "const",
@@ -27,7 +27,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./a",
+    source: "/a",
     description: `Add import from "./a"`,
     newFileContent: `import { foo } from "./a";
 
diff --git a/tests/cases/fourslash/completionsImport_notFromIndex.ts b/tests/cases/fourslash/completionsImport_notFromIndex.ts
index 6b1cd2c9c7627..87b167d338927 100644
--- a/tests/cases/fourslash/completionsImport_notFromIndex.ts
+++ b/tests/cases/fourslash/completionsImport_notFromIndex.ts
@@ -1,5 +1,7 @@
 /// <reference path="fourslash.ts" />
 
+// @moduleResolution: node10
+
 // @Filename: /src/a.ts
 ////export const x = 0;
 
@@ -20,8 +22,11 @@ for (const [marker, sourceDisplay] of [["0", "./src"], ["1", "./a"], ["2", "../a
         marker,
         includes: {
             name: "x",
-            source: sourceDisplay,
+            source: "/src/a",
             sourceDisplay,
+            text: "const x: 0",
+            kind: "const",
+            kindModifiers: "export",
             hasAction: true,
             sortText: completion.SortText.AutoImportSuggestions
         },
@@ -29,7 +34,7 @@ for (const [marker, sourceDisplay] of [["0", "./src"], ["1", "./a"], ["2", "../a
     });
     verify.applyCodeActionFromCompletion(marker, {
         name: "x",
-        source: sourceDisplay,
+        source: "/src/a",
         description: `Add import from "${sourceDisplay}"`,
         newFileContent: `import { x } from "${sourceDisplay}";\n\nx`,
     });
diff --git a/tests/cases/fourslash/completionsImport_ofAlias.ts b/tests/cases/fourslash/completionsImport_ofAlias.ts
index 20b86ec2a5d32..e6a882f712539 100644
--- a/tests/cases/fourslash/completionsImport_ofAlias.ts
+++ b/tests/cases/fourslash/completionsImport_ofAlias.ts
@@ -28,7 +28,7 @@ verify.completions({
         completion.undefinedVarEntry,
         {
             name: "foo",
-            source: "./a",
+            source: "/a",
             sourceDisplay: "./a",
             text: "(alias) const foo: 0\nexport foo",
             kind: "alias",
@@ -42,7 +42,7 @@ verify.completions({
 
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./a",
+    source: "/a",
     description: `Add import from "./a"`,
     newFileContent: `import { foo } from "./a";
 
diff --git a/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts b/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts
index 3bdd5e326bba1..aaea053032775 100644
--- a/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts
+++ b/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts
@@ -2,6 +2,7 @@
 
 // Test that the completion is for the shortest path, even if that's a re-export.
 
+// @moduleResolution: node10
 // @module: commonJs
 // @noLib: true
 
@@ -19,10 +20,10 @@ verify.completions({
     exact: completion.globalsPlus([
         {
             name: "foo",
-            source: "./foo",
+            source: "/foo/lib/foo",
             sourceDisplay: "./foo",
-            text: "(alias) const foo: 0\nexport foo",
-            kind: "alias",
+            text: "const foo: 0",
+            kind: "const",
             kindModifiers: "export",
             hasAction: true,
             sortText: completion.SortText.AutoImportSuggestions
@@ -32,7 +33,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./foo",
+    source: "/foo/lib/foo",
     description: `Add import from "./foo"`,
     newFileContent: `import { foo } from "./foo";
 
diff --git a/tests/cases/fourslash/completionsImport_quoteStyle.ts b/tests/cases/fourslash/completionsImport_quoteStyle.ts
index 15d38586c4c52..a06fc247e961b 100644
--- a/tests/cases/fourslash/completionsImport_quoteStyle.ts
+++ b/tests/cases/fourslash/completionsImport_quoteStyle.ts
@@ -11,7 +11,7 @@
 goTo.marker("");
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./a",
+    source: "/a",
     description: `Add import from "./a"`,
     preferences: {
         quotePreference: "single",
diff --git a/tests/cases/fourslash/completionsImport_reExportDefault.ts b/tests/cases/fourslash/completionsImport_reExportDefault.ts
index 1a84942123b93..0216f5730b556 100644
--- a/tests/cases/fourslash/completionsImport_reExportDefault.ts
+++ b/tests/cases/fourslash/completionsImport_reExportDefault.ts
@@ -1,6 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @module: esnext
+// @moduleResolution: node10
 
 // @Filename: /a/b/impl.ts
 ////export default function foo() {}
@@ -16,10 +17,10 @@ verify.completions({
     exact: completion.globalsPlus([
         {
             name: "foo",
-            source: "./a",
+            source: "/a/b/impl",
             sourceDisplay: "./a",
-            text: "(alias) function foo(): void\nexport foo",
-            kind: "alias",
+            text: "function foo(): void",
+            kind: "function",
             kindModifiers: "export",
             hasAction: true,
             sortText: completion.SortText.AutoImportSuggestions
@@ -29,7 +30,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "./a",
+    source: "/a/b/impl",
     description: `Add import from "./a"`,
     newFileContent: `import { foo } from "./a";
 
diff --git a/tests/cases/fourslash/completionsThisProperties_globalType.ts b/tests/cases/fourslash/completionsThisProperties_globalType.ts
index 3b4b81db3b1e4..19d63008c87d1 100644
--- a/tests/cases/fourslash/completionsThisProperties_globalType.ts
+++ b/tests/cases/fourslash/completionsThisProperties_globalType.ts
@@ -23,7 +23,8 @@ test.markerNames().forEach(marker => {
       kind: "var",
       kindModifiers: "declare",
       sortText: completion.SortText.GlobalsOrKeywords
-    }],
+    }]
+  }, {
     preferences: {
       includeInsertTextCompletions: true
     }
diff --git a/tests/cases/fourslash/completionsUniqueSymbol_import.ts b/tests/cases/fourslash/completionsUniqueSymbol_import.ts
index ef57d17ee7a20..dbdaec369ac4e 100644
--- a/tests/cases/fourslash/completionsUniqueSymbol_import.ts
+++ b/tests/cases/fourslash/completionsUniqueSymbol_import.ts
@@ -24,7 +24,7 @@ verify.completions({
     marker: "",
     exact: [
         "n",
-        { name: "publicSym", source: "./a", insertText: "[publicSym]", sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[0], hasAction: true },
+        { name: "publicSym", source: "/a", insertText: "[publicSym]", sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[0], hasAction: true },
     ],
     preferences: {
         includeInsertTextCompletions: true,
@@ -34,7 +34,7 @@ verify.completions({
 
 verify.applyCodeActionFromCompletion("", {
     name: "publicSym",
-    source: "./a",
+    source: "/a",
     description: `Update import from "./a"`,
     newFileContent:
 `import { i, publicSym } from "./a";
diff --git a/tests/cases/fourslash/completionsWithDeprecatedTag9.ts b/tests/cases/fourslash/completionsWithDeprecatedTag9.ts
index 30850e192c1ff..0a1e2c0c5ad94 100644
--- a/tests/cases/fourslash/completionsWithDeprecatedTag9.ts
+++ b/tests/cases/fourslash/completionsWithDeprecatedTag9.ts
@@ -11,24 +11,19 @@
 ////class Foo {
 ////    foo: number;
 ////    m() {
-////        [|foo|]/**/
+////        foo/**/
 ////    }
 ////}
 
 verify.completions({
     marker: "",
     includes: [{
-        name: "foo",
-        insertText: "this.foo",
-        kind: "property",
-        source: completion.CompletionSource.ThisProperty,
-        sortText: completion.SortText.SuggestedClassMembers,
-    }, {
         name: "foo",
         kind: "var",
         kindModifiers: "deprecated,declare",
         sortText: completion.SortText.Deprecated(completion.SortText.GlobalsOrKeywords),
-    }],
+    }]
+}, {
     preferences: {
         includeInsertTextCompletions: true
     }
diff --git a/tests/cases/fourslash/getPreProcessedFile.ts b/tests/cases/fourslash/getPreProcessedFile.ts
index 348c2bba52d29..a33a6c9a470ce 100644
--- a/tests/cases/fourslash/getPreProcessedFile.ts
+++ b/tests/cases/fourslash/getPreProcessedFile.ts
@@ -1,6 +1,5 @@
 /// <reference path="fourslash.ts" />
-
-// @moduleResolution: classic
+// @ModuleResolution: classic
 
 // @Filename: refFile1.ts
 //// class D { }
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
index 303d79a67cc70..db0c12dd5e03c 100644
--- a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
+++ b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
@@ -12,6 +12,6 @@
 ////foo
 
 goTo.file('/index.ts');
-verify.importFixAtPosition([`import foo from "foo";
+verify.importFixAtPosition([`import * as foo from "foo";
 
 foo`]);
diff --git a/tests/cases/fourslash/importTypeCompletions7.ts b/tests/cases/fourslash/importTypeCompletions7.ts
index e24e1519772d7..22fa2076bcd62 100644
--- a/tests/cases/fourslash/importTypeCompletions7.ts
+++ b/tests/cases/fourslash/importTypeCompletions7.ts
@@ -17,7 +17,7 @@ verify.completions({
         name: "Foo",
         sourceDisplay: "./foo",
         source: "./foo",
-        insertText: "import Foo from \"./foo\";",
+        insertText: "import * as Foo from \"./foo\";",
         replacementSpan: test.ranges()[0]
     }, {
         name: "type",
diff --git a/tests/cases/fourslash/javascriptModules24.ts b/tests/cases/fourslash/javascriptModules24.ts
index 53022eb53ab44..c868d0c9748f6 100644
--- a/tests/cases/fourslash/javascriptModules24.ts
+++ b/tests/cases/fourslash/javascriptModules24.ts
@@ -15,6 +15,6 @@
 goTo.marker('1');
 
 /**** BUG: Should be an error to invoke a call signature on a namespace import ****/
-verify.errorExistsBeforeMarker('1');
-verify.quickInfoIs("(alias) function foo(): number\n(alias) namespace foo\nimport foo");
+//verify.errorExistsBeforeMarker('1');
+verify.quickInfoIs("(alias) foo(): number\nimport foo");
 verify.signatureHelp({ marker: "2", argumentCount: 1 });
diff --git a/tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts b/tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts
index fd2d095d4e5ce..6051a5d80fc7a 100644
--- a/tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts
+++ b/tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts
@@ -26,8 +26,8 @@ goTo.eachMarker(() => {
     verify.completions({
         includes: {
             name: "fail",
-            source: "foo",
-            sourceDisplay: "foo",
+            source: "/node_modules/foo/index",
+            sourceDisplay: "./node_modules/foo/index",
             text: "const fail: number",
             kind: "const",
             kindModifiers: "export,declare",
@@ -40,8 +40,8 @@ goTo.eachMarker(() => {
     verify.completions({
         includes: {
             name: "fail",
-            source: "foo",
-            sourceDisplay: "foo",
+            source: "/node_modules/foo/index",
+            sourceDisplay: "./node_modules/foo/index",
             text: "const fail: number",
             kind: "const",
             kindModifiers: "export,declare",
diff --git a/tests/cases/fourslash/organizeImportsReactJsx.ts b/tests/cases/fourslash/organizeImportsReactJsx.ts
index 4d959b20473be..6e5ccb7bdaee5 100644
--- a/tests/cases/fourslash/organizeImportsReactJsx.ts
+++ b/tests/cases/fourslash/organizeImportsReactJsx.ts
@@ -13,7 +13,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts"
+////    "types": "index.d.ts",
 ////}
 
 // @filename: node_modules/react/index.d.ts
diff --git a/tests/cases/fourslash/organizeImportsReactJsxDev.ts b/tests/cases/fourslash/organizeImportsReactJsxDev.ts
index 80ba8ff0c270d..de2be31661717 100644
--- a/tests/cases/fourslash/organizeImportsReactJsxDev.ts
+++ b/tests/cases/fourslash/organizeImportsReactJsxDev.ts
@@ -13,7 +13,7 @@
 // @filename: node_modules/react/package.json
 ////{
 ////    "name": "react",
-////    "types": "index.d.ts"
+////    "types": "index.d.ts",
 ////}
 
 // @filename: node_modules/react/index.d.ts
diff --git a/tests/cases/fourslash/server/autoImportProvider3.ts b/tests/cases/fourslash/server/autoImportProvider3.ts
index 1f6024116c24a..106fd20a5e112 100644
--- a/tests/cases/fourslash/server/autoImportProvider3.ts
+++ b/tests/cases/fourslash/server/autoImportProvider3.ts
@@ -32,13 +32,13 @@ verify.completions({
   includes: [{
     name: "PackageDependency",
     hasAction: true,
-    source: "package-dependency",
+    source: "/home/src/workspaces/project/node_modules/package-dependency/index",
     sortText: completion.SortText.AutoImportSuggestions,
     isPackageJsonImport: true
   }, {
     name: "CommonDependency",
     hasAction: true,
-    source: "common-dependency",
+    source: "/home/src/workspaces/project/node_modules/common-dependency/index",
     sortText: completion.SortText.AutoImportSuggestions,
     isPackageJsonImport: true
   }],
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts b/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts
index 83938188ccb4f..153bc7ae4ece0 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_exportUndefined.ts
@@ -20,7 +20,7 @@ verify.completions({
     name: "x",
      hasAction: true,
      sortText: completion.SortText.AutoImportSuggestions,
-     source: "./undefinedAlias"
+     source: "/home/src/workspaces/project/undefinedAlias"
   }],
   preferences: {
     includeCompletionsForModuleExports: true,
@@ -34,7 +34,7 @@ verify.completions({
     name: "x",
      hasAction: true,
      sortText: completion.SortText.AutoImportSuggestions,
-     source: "./undefinedAlias"
+     source: "/home/src/workspaces/project/undefinedAlias"
   }],
   preferences: {
     includeCompletionsForModuleExports: true,
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts b/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
index 4241243654821..4eb82b806df39 100644
--- a/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
+++ b/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
@@ -26,7 +26,7 @@ function verifyIncludes(name: string) {
   verify.completions({
       includes: {
           name,
-          source: "react",
+          source: "/home/src/workspaces/project/node_modules/@types/react/index",
           hasAction: true,
           sortText: completion.SortText.AutoImportSuggestions,
       },

From 07d33dc668c9a0c3f8d15afb39a9ee68f7c55bf3 Mon Sep 17 00:00:00 2001
From: Tudor Gradinaru <tudor.rodut@yahoo.com>
Date: Mon, 27 Oct 2025 11:50:25 +0200
Subject: [PATCH 5/5] Update test baselines to reflect QuickInfo behavior
 changes

---
 tests/baselines/reference/api/typescript.d.ts |     4 +-
 ...completionsCommitCharactersGlobal.baseline | 14482 ++++++++++++----
 ...EmitPrivatePromiseLikeInterface.errors.txt |    42 +
 .../reference/quickInfoJsDocTags15.baseline   |   120 +-
 .../reference/quickinfoVerbosityJs.baseline   |    50 +-
 .../quickinfoVerbosityMappedType.baseline     |    56 +-
 .../quickinfoVerbosityRecursiveType.baseline  |   180 +-
 .../quickinfoVerbosityTypeParameter.baseline  |    88 +-
 .../fourslashServer/jsdocCallbackTag.js       |     4 +-
 .../fourslash/server/jsdocCallbackTag.ts      |     4 +-
 10 files changed, 11031 insertions(+), 3999 deletions(-)
 create mode 100644 tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt

diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index ec624a12be559..c2a602df1ae47 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -6395,6 +6395,7 @@ declare namespace ts {
         InObjectTypeLiteral = 4194304,
         InTypeAlias = 8388608,
         InInitialEntityName = 16777216,
+        InQuickInfo = 134217728,
     }
     enum TypeFormatFlags {
         None = 0,
@@ -6420,7 +6421,8 @@ declare namespace ts {
         InElementType = 2097152,
         InFirstTypeArgument = 4194304,
         InTypeAlias = 8388608,
-        NodeBuilderFlagsMask = 848330095,
+        InQuickInfo = 134217728,
+        NodeBuilderFlagsMask = 982547823,
     }
     enum SymbolFormatFlags {
         None = 0,
diff --git a/tests/baselines/reference/completionsCommitCharactersGlobal.baseline b/tests/baselines/reference/completionsCommitCharactersGlobal.baseline
index 582d3363da492..76745ebb77569 100644
--- a/tests/baselines/reference/completionsCommitCharactersGlobal.baseline
+++ b/tests/baselines/reference/completionsCommitCharactersGlobal.baseline
@@ -2603,7 +2603,26 @@
 // | asserts
 // | type Awaited<T> = T extends null ? T : T extends object & {
 // |     then(onfulfilled: infer F, ...args: infer _): any;
-// | } ? F extends (value: infer V, ...args: infer _) => any ? Awaited<...> : never : T
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then( ...
 // | bigint
 // | boolean
 // | interface Boolean
@@ -2629,9 +2648,17 @@
 // | interface Date
 // | var Date: DateConstructor
 // | interface DateConstructor
-// | type DecoratorContext = ClassMemberDecoratorContext | ClassDecoratorContext<abstract new (...args: any) => any>
-// | type DecoratorMetadata = Record<PropertyKey, unknown> & object
-// | type DecoratorMetadataObject = Record<PropertyKey, unknown> & object
+// | type DecoratorContext = (ClassMethodDecoratorContext<unknown, (this: unknown, ...args: any) => any> | ClassGetterDecoratorContext<unknown, unknown> | ClassSetterDecoratorContext<unknown, unknown> | ClassFieldDecoratorContext<...> | ClassAccessorDecoratorContext<...>) | ClassDecoratorContext<...>
+// | type DecoratorMetadata = {
+// |     [x: string]: unknown;
+// |     [x: number]: unknown;
+// |     [x: symbol]: unknown;
+// | } & object
+// | type DecoratorMetadataObject = {
+// |     [x: string]: unknown;
+// |     [x: number]: unknown;
+// |     [x: symbol]: unknown;
+// | } & object
 // | interface Error
 // | var Error: ErrorConstructor
 // | interface ErrorConstructor
@@ -2687,9 +2714,9 @@
 // | interface Object
 // | var Object: ObjectConstructor
 // | interface ObjectConstructor
-// | type Omit<T, K extends keyof any> = { [P in Exclude<keyof T, K>]: T[P]; }
-// | type OmitThisParameter<T> = unknown extends ThisParameterType<T> ? T : T extends (...args: infer A) => infer R ? (...args: A) => R : T
-// | type ParameterDecorator = (target: Object, propertyKey: string | symbol | undefined, parameterIndex: number) => void
+// | type Omit<T, K extends keyof any> = { [P in keyof T extends K ? never : keyof T]: T[P]; }
+// | type OmitThisParameter<T> = unknown extends (T extends (this: infer U, ...args: never) => any ? U : unknown) ? T : T extends (...args: infer A) => infer R ? (...args: A) => R : T
+// | type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 // | type Parameters<T extends (...args: any) => any> = T extends (...args: infer P) => any ? P : never
 // | type Partial<T> = { [P in keyof T]?: T[P]; }
 // | type Pick<T, K extends keyof T> = { [P in K]: T[P]; }
@@ -2783,7 +2810,26 @@
 // | asserts
 // | type Awaited<T> = T extends null ? T : T extends object & {
 // |     then(onfulfilled: infer F, ...args: infer _): any;
-// | } ? F extends (value: infer V, ...args: infer _) => any ? Awaited<...> : never : T
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then(onfulfilled: infer F, ...args: infer _): any;
+// | } ? F extends (value: infer V, ...args: infer _) => any ? V extends null ? V : V extends object & {
+// |     then( ...
 // | bigint
 // | boolean
 // | interface Boolean
@@ -2809,9 +2855,17 @@
 // | interface Date
 // | var Date: DateConstructor
 // | interface DateConstructor
-// | type DecoratorContext = ClassMemberDecoratorContext | ClassDecoratorContext<abstract new (...args: any) => any>
-// | type DecoratorMetadata = Record<PropertyKey, unknown> & object
-// | type DecoratorMetadataObject = Record<PropertyKey, unknown> & object
+// | type DecoratorContext = (ClassMethodDecoratorContext<unknown, (this: unknown, ...args: any) => any> | ClassGetterDecoratorContext<unknown, unknown> | ClassSetterDecoratorContext<unknown, unknown> | ClassFieldDecoratorContext<...> | ClassAccessorDecoratorContext<...>) | ClassDecoratorContext<...>
+// | type DecoratorMetadata = {
+// |     [x: string]: unknown;
+// |     [x: number]: unknown;
+// |     [x: symbol]: unknown;
+// | } & object
+// | type DecoratorMetadataObject = {
+// |     [x: string]: unknown;
+// |     [x: number]: unknown;
+// |     [x: symbol]: unknown;
+// | } & object
 // | interface Error
 // | var Error: ErrorConstructor
 // | interface ErrorConstructor
@@ -2867,9 +2921,9 @@
 // | interface Object
 // | var Object: ObjectConstructor
 // | interface ObjectConstructor
-// | type Omit<T, K extends keyof any> = { [P in Exclude<keyof T, K>]: T[P]; }
-// | type OmitThisParameter<T> = unknown extends ThisParameterType<T> ? T : T extends (...args: infer A) => infer R ? (...args: A) => R : T
-// | type ParameterDecorator = (target: Object, propertyKey: string | symbol | undefined, parameterIndex: number) => void
+// | type Omit<T, K extends keyof any> = { [P in keyof T extends K ? never : keyof T]: T[P]; }
+// | type OmitThisParameter<T> = unknown extends (T extends (this: infer U, ...args: never) => any ? U : unknown) ? T : T extends (...args: infer A) => infer R ? (...args: A) => R : T
+// | type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 // | type Parameters<T extends (...args: any) => any> = T extends (...args: infer P) => any ? P : never
 // | type Partial<T> = { [P in keyof T]?: T[P]; }
 // | type Pick<T, K extends keyof T> = { [P in K]: T[P]; }
@@ -75032,35 +75086,23 @@
               "kind": "space"
             },
             {
-              "text": "Awaited",
-              "kind": "aliasName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "...",
-              "kind": "text"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "never",
+              "text": "null",
               "kind": "keyword"
             },
             {
@@ -75068,7 +75110,7 @@
               "kind": "space"
             },
             {
-              "text": ":",
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -75076,98 +75118,39 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Recursively unwraps the \"awaited type\" of a type. Non-promise \"thenables\" should resolve to `never`. This emulates the behavior of `await`.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "bigint",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "bigint",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "boolean",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "boolean",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Boolean",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Boolean",
-              "kind": "localName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Boolean",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "BooleanConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "BooleanConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "object",
               "kind": "keyword"
             },
             {
@@ -75175,65 +75158,47 @@
               "kind": "space"
             },
             {
-              "text": "BooleanConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "CallableFunction",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "&",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "CallableFunction",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Capitalize",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "{",
+              "kind": "punctuation"
+            },
             {
-              "text": "type",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "Capitalize",
-              "kind": "aliasName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "<",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "S",
-              "kind": "typeParameterName"
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -75241,11 +75206,11 @@
               "kind": "space"
             },
             {
-              "text": "string",
-              "kind": "keyword"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
-              "text": ">",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -75253,33 +75218,23 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "intrinsic",
-              "kind": "keyword"
-            }
-          ],
-          "documentation": [
+              "text": ":",
+              "kind": "punctuation"
+            },
             {
-              "text": "Convert first character of string literal type to uppercase",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ClassAccessorDecoratorContext",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -75287,35 +75242,35 @@
               "kind": "space"
             },
             {
-              "text": "ClassAccessorDecoratorContext",
-              "kind": "interfaceName"
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
+              "text": ")",
               "kind": "punctuation"
             },
             {
-              "text": "This",
-              "kind": "typeParameterName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ";",
+              "kind": "punctuation"
             },
             {
-              "text": "unknown",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": ",",
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -75323,97 +75278,55 @@
               "kind": "space"
             },
             {
-              "text": "Value",
-              "kind": "typeParameterName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "extends",
               "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Context provided to a class `accessor` field decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
-                  "kind": "text"
-                }
-              ]
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type of decorated class field.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassAccessorDecoratorResult",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "value",
+              "kind": "parameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassAccessorDecoratorResult",
-              "kind": "interfaceName"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "This",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -75425,85 +75338,35 @@
               "kind": "space"
             },
             {
-              "text": "Value",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
+              "text": "...",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Describes the allowed return value from a class `accessor` field decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
-            {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The `this` type to which the target applies.",
-                  "kind": "text"
-                }
-              ]
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The property type for the class `accessor` field.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassAccessorDecoratorTarget",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "args",
+              "kind": "parameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassAccessorDecoratorTarget",
-              "kind": "interfaceName"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "This",
+              "text": "_",
               "kind": "typeParameterName"
             },
             {
-              "text": ",",
+              "text": ")",
               "kind": "punctuation"
             },
             {
@@ -75511,65 +75374,15 @@
               "kind": "space"
             },
             {
-              "text": "Value",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
+              "text": "=>",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Describes the target provided to class `accessor` field decorators.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
-            {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The `this` type to which the target applies.",
-                  "kind": "text"
-                }
-              ]
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The property type for the class `accessor` field.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassDecorator",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "type",
+              "text": "any",
               "kind": "keyword"
             },
             {
@@ -75577,35 +75390,31 @@
               "kind": "space"
             },
             {
-              "text": "ClassDecorator",
-              "kind": "aliasName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "TFunction",
-              "kind": "typeParameterName"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "null",
               "kind": "keyword"
             },
             {
@@ -75613,20 +75422,20 @@
               "kind": "space"
             },
             {
-              "text": "Function",
-              "kind": "localName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "target",
-              "kind": "parameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": ":",
@@ -75637,35 +75446,31 @@
               "kind": "space"
             },
             {
-              "text": "TFunction",
+              "text": "V",
               "kind": "typeParameterName"
             },
-            {
-              "text": ")",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "TFunction",
-              "kind": "typeParameterName"
+              "text": "object",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": "&",
               "kind": "punctuation"
             },
             {
@@ -75673,44 +75478,39 @@
               "kind": "space"
             },
             {
-              "text": "void",
-              "kind": "keyword"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ClassDecoratorContext",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "{",
+              "kind": "punctuation"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "ClassDecoratorContext",
-              "kind": "interfaceName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "<",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "Class",
-              "kind": "typeParameterName"
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -75718,32 +75518,48 @@
               "kind": "space"
             },
             {
-              "text": "abstract",
-              "kind": "keyword"
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "new",
-              "kind": "keyword"
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
-              "text": "...",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "args",
-              "kind": "parameterName"
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": ":",
@@ -75758,7 +75574,15 @@
               "kind": "keyword"
             },
             {
-              "text": ")",
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -75766,7 +75590,7 @@
               "kind": "space"
             },
             {
-              "text": "=>",
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -75774,31 +75598,39 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "abstract",
-              "kind": "keyword"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "new",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -75806,9 +75638,17 @@
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
               "kind": "punctuation"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "...",
               "kind": "punctuation"
@@ -75826,9 +75666,17 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "infer",
               "kind": "keyword"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -75850,80 +75698,59 @@
               "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "Context provided to a class decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
+              "text": "?",
+              "kind": "punctuation"
+            },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Class",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type of the decorated class associated with this context.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassFieldDecoratorContext",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassFieldDecoratorContext",
-              "kind": "interfaceName"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "This",
-              "kind": "typeParameterName"
+              "text": "null",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": ",",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -75931,7 +75758,7 @@
               "kind": "space"
             },
             {
-              "text": "Value",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -75939,106 +75766,72 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "object",
               "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "Context provided to a class field decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
+              "text": "&",
+              "kind": "punctuation"
+            },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
-                  "kind": "text"
-                }
-              ]
+              "text": " ",
+              "kind": "space"
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type of the decorated class field.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassGetterDecoratorContext",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "{",
+              "kind": "punctuation"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "ClassGetterDecoratorContext",
-              "kind": "interfaceName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "<",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "This",
-              "kind": "typeParameterName"
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
-              "kind": "keyword"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
               "text": ",",
@@ -76049,119 +75842,85 @@
               "kind": "space"
             },
             {
-              "text": "Value",
-              "kind": "typeParameterName"
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
-              "kind": "keyword"
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "text": ">",
+              "text": ")",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Context provided to a class getter decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
+            },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
-                  "kind": "text"
-                }
-              ]
+              "text": ":",
+              "kind": "punctuation"
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The property type of the decorated class getter.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassMemberDecoratorContext",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "type",
+              "text": "any",
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ";",
+              "kind": "punctuation"
             },
             {
-              "text": "ClassMemberDecoratorContext",
-              "kind": "aliasName"
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassMethodDecoratorContext",
-              "kind": "interfaceName"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "extends",
               "kind": "keyword"
             },
-            {
-              "text": ",",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
@@ -76171,7 +75930,7 @@
               "kind": "punctuation"
             },
             {
-              "text": "this",
+              "text": "value",
               "kind": "parameterName"
             },
             {
@@ -76183,9 +75942,17 @@
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "infer",
               "kind": "keyword"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
             {
               "text": ",",
               "kind": "punctuation"
@@ -76211,9 +75978,17 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "infer",
               "kind": "keyword"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -76235,7 +76010,11 @@
               "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -76243,27 +76022,31 @@
               "kind": "space"
             },
             {
-              "text": "|",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassGetterDecoratorContext",
-              "kind": "interfaceName"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "null",
               "kind": "keyword"
             },
             {
-              "text": ",",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -76271,19 +76054,15 @@
               "kind": "space"
             },
             {
-              "text": "unknown",
-              "kind": "keyword"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -76291,31 +76070,31 @@
               "kind": "space"
             },
             {
-              "text": "ClassSetterDecoratorContext",
-              "kind": "interfaceName"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "extends",
               "kind": "keyword"
             },
-            {
-              "text": ",",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "object",
               "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
               "kind": "punctuation"
             },
             {
@@ -76323,27 +76102,31 @@
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": "{",
               "kind": "punctuation"
             },
             {
-              "text": " ",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "ClassFieldDecoratorContext",
-              "kind": "interfaceName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "<",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "...",
-              "kind": "text"
+              "text": "onfulfilled",
+              "kind": "parameterName"
             },
             {
-              "text": ">",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -76351,81 +76134,79 @@
               "kind": "space"
             },
             {
-              "text": "|",
-              "kind": "punctuation"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassAccessorDecoratorContext",
-              "kind": "interfaceName"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
+              "text": ",",
               "kind": "punctuation"
             },
             {
-              "text": "...",
-              "kind": "text"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ">",
+              "text": "...",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": [
+            },
             {
-              "text": "The decorator context types provided to class element decorators.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ClassMethodDecoratorContext",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "args",
+              "kind": "parameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassMethodDecoratorContext",
-              "kind": "interfaceName"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "This",
+              "text": "_",
               "kind": "typeParameterName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "any",
               "kind": "keyword"
             },
             {
-              "text": ",",
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -76433,7 +76214,15 @@
               "kind": "space"
             },
             {
-              "text": "Value",
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
               "kind": "typeParameterName"
             },
             {
@@ -76453,7 +76242,7 @@
               "kind": "punctuation"
             },
             {
-              "text": "this",
+              "text": "value",
               "kind": "parameterName"
             },
             {
@@ -76465,7 +76254,15 @@
               "kind": "space"
             },
             {
-              "text": "This",
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -76493,9 +76290,17 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "infer",
               "kind": "keyword"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -76521,35 +76326,39 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "this",
-              "kind": "parameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "This",
-              "kind": "typeParameterName"
+              "text": "null",
+              "kind": "keyword"
             },
             {
-              "text": ",",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -76557,12 +76366,12 @@
               "kind": "space"
             },
             {
-              "text": "...",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "args",
-              "kind": "parameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": ":",
@@ -76573,118 +76382,80 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
-            },
-            {
-              "text": ")",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "object",
               "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "Context provided to a class method decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
+              "text": "&",
+              "kind": "punctuation"
+            },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
-                  "kind": "text"
-                }
-              ]
+              "text": " ",
+              "kind": "space"
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type of the decorated class method.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ClassSetterDecoratorContext",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "{",
+              "kind": "punctuation"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "ClassSetterDecoratorContext",
-              "kind": "interfaceName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "<",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "This",
-              "kind": "typeParameterName"
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
-              "kind": "keyword"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
               "text": ",",
@@ -76695,130 +76466,75 @@
               "kind": "space"
             },
             {
-              "text": "Value",
-              "kind": "typeParameterName"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "infer",
               "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Context provided to a class setter decorator.",
-              "kind": "text"
-            }
-          ],
-          "tags": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "This",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
-                  "kind": "text"
-                }
-              ]
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "name": "template",
-              "text": [
-                {
-                  "text": "Value",
-                  "kind": "typeParameterName"
-                },
-                {
-                  "text": " ",
-                  "kind": "space"
-                },
-                {
-                  "text": "The type of the decorated class setter.",
-                  "kind": "text"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "ConcatArray",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": ")",
+              "kind": "punctuation"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ConcatArray",
-              "kind": "interfaceName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": "<",
+              "text": ";",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": ">",
+              "text": "}",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ConstructorParameters",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
-              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ConstructorParameters",
-              "kind": "aliasName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "T",
+              "text": "F",
               "kind": "typeParameterName"
             },
             {
@@ -76834,15 +76550,23 @@
               "kind": "space"
             },
             {
-              "text": "abstract",
-              "kind": "keyword"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "new",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -76850,9 +76574,17 @@
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
               "kind": "punctuation"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "...",
               "kind": "punctuation"
@@ -76870,9 +76602,17 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "infer",
               "kind": "keyword"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -76893,24 +76633,20 @@
               "text": "any",
               "kind": "keyword"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -76926,7 +76662,7 @@
               "kind": "space"
             },
             {
-              "text": "abstract",
+              "text": "null",
               "kind": "keyword"
             },
             {
@@ -76934,24 +76670,20 @@
               "kind": "space"
             },
             {
-              "text": "new",
-              "kind": "keyword"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "...",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "args",
-              "kind": "parameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": ":",
@@ -76962,56 +76694,60 @@
               "kind": "space"
             },
             {
-              "text": "infer",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ")",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "object",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "&",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "?",
+              "text": "{",
               "kind": "punctuation"
             },
             {
-              "text": " ",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "P",
-              "kind": "typeParameterName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
             },
             {
               "text": ":",
@@ -77022,49 +76758,43 @@
               "kind": "space"
             },
             {
-              "text": "never",
+              "text": "infer",
               "kind": "keyword"
-            }
-          ],
-          "documentation": [
+            },
             {
-              "text": "Obtain the parameters of a constructor function type in a tuple",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "DataView",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "DataView",
-              "kind": "localName"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "TArrayBuffer",
-              "kind": "typeParameterName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -77072,27 +76802,27 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ";",
               "kind": "punctuation"
             },
             {
@@ -77100,40 +76830,31 @@
               "kind": "lineBreak"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "}",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "DataView",
-              "kind": "localName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
-              "text": ":",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "DataViewConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "DataViewConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -77141,36 +76862,23 @@
               "kind": "space"
             },
             {
-              "text": "DataViewConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Date",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "value",
+              "kind": "parameterName"
             },
             {
-              "text": "Date",
-              "kind": "localName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -77178,11 +76886,11 @@
               "kind": "space"
             },
             {
-              "text": "Date",
-              "kind": "localName"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": ":",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -77190,46 +76898,23 @@
               "kind": "space"
             },
             {
-              "text": "DateConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "...",
+              "kind": "punctuation"
+            },
             {
-              "text": "Enables basic storage and retrieval of dates and times.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "DateConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "args",
+              "kind": "parameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "DateConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "DecoratorContext",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -77237,31 +76922,35 @@
               "kind": "space"
             },
             {
-              "text": "DecoratorContext",
-              "kind": "aliasName"
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "=>",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ClassMemberDecoratorContext",
-              "kind": "aliasName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -77269,15 +76958,15 @@
               "kind": "space"
             },
             {
-              "text": "ClassDecoratorContext",
-              "kind": "interfaceName"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "abstract",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -77285,7 +76974,7 @@
               "kind": "space"
             },
             {
-              "text": "new",
+              "text": "null",
               "kind": "keyword"
             },
             {
@@ -77293,31 +76982,23 @@
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "...",
+              "text": "?",
               "kind": "punctuation"
             },
             {
-              "text": "args",
-              "kind": "parameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
-            },
-            {
-              "text": ")",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -77325,37 +77006,23 @@
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "extends",
               "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "The decorator context types provided to any decorator.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "DecoratorMetadata",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "type",
+              "text": "object",
               "kind": "keyword"
             },
             {
@@ -77363,35 +77030,39 @@
               "kind": "space"
             },
             {
-              "text": "DecoratorMetadata",
-              "kind": "aliasName"
+              "text": "&",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "{",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "Record",
-              "kind": "aliasName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "<",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "PropertyKey",
-              "kind": "aliasName"
+              "text": "onfulfilled",
+              "kind": "parameterName"
             },
             {
-              "text": ",",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -77399,19 +77070,19 @@
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "infer",
               "kind": "keyword"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "&",
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -77419,56 +77090,39 @@
               "kind": "space"
             },
             {
-              "text": "object",
-              "kind": "keyword"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "DecoratorMetadataObject",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
-              "kind": "keyword"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "DecoratorMetadataObject",
-              "kind": "aliasName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Record",
-              "kind": "aliasName"
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
+              "text": ")",
               "kind": "punctuation"
             },
             {
-              "text": "PropertyKey",
-              "kind": "aliasName"
-            },
-            {
-              "text": ",",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -77476,19 +77130,19 @@
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "any",
               "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ";",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": "&",
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -77496,36 +77150,23 @@
               "kind": "space"
             },
             {
-              "text": "object",
-              "kind": "keyword"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Error",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Error",
-              "kind": "localName"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -77533,53 +77174,23 @@
               "kind": "space"
             },
             {
-              "text": "Error",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "value",
+              "kind": "parameterName"
             },
             {
-              "text": "ErrorConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ErrorConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ErrorConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "EvalError",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -77587,69 +77198,35 @@
               "kind": "space"
             },
             {
-              "text": "EvalError",
-              "kind": "localName"
-            },
-            {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "EvalError",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
+              "text": "...",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "EvalErrorConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "EvalErrorConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "EvalErrorConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Exclude",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -77657,19 +77234,19 @@
               "kind": "space"
             },
             {
-              "text": "Exclude",
-              "kind": "aliasName"
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
+              "text": ")",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ",",
+              "text": "=>",
               "kind": "punctuation"
             },
             {
@@ -77677,27 +77254,23 @@
               "kind": "space"
             },
             {
-              "text": "U",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
+              "text": "any",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -77713,8 +77286,8 @@
               "kind": "space"
             },
             {
-              "text": "U",
-              "kind": "typeParameterName"
+              "text": "null",
+              "kind": "keyword"
             },
             {
               "text": " ",
@@ -77729,8 +77302,8 @@
               "kind": "space"
             },
             {
-              "text": "never",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
@@ -77745,25 +77318,15 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
-            }
-          ],
-          "documentation": [
+            },
             {
-              "text": "Exclude from T those types that are assignable to U",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "Extract",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "type",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -77771,31 +77334,47 @@
               "kind": "space"
             },
             {
-              "text": "Extract",
-              "kind": "aliasName"
+              "text": "object",
+              "kind": "keyword"
             },
             {
-              "text": "<",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ",",
+              "text": "{",
               "kind": "punctuation"
             },
             {
-              "text": " ",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "U",
-              "kind": "typeParameterName"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": ">",
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -77803,52 +77382,56 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "F",
               "kind": "typeParameterName"
             },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
-              "kind": "keyword"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "U",
-              "kind": "typeParameterName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "?",
-              "kind": "punctuation"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "_",
               "kind": "typeParameterName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": ":",
@@ -77859,53 +77442,35 @@
               "kind": "space"
             },
             {
-              "text": "never",
+              "text": "any",
               "kind": "keyword"
-            }
-          ],
-          "documentation": [
+            },
             {
-              "text": "Extract from T those types that are assignable to U",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "false",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+              "text": ";",
+              "kind": "punctuation"
+            },
             {
-              "text": "false",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Float32Array",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "\n",
+              "kind": "lineBreak"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "}",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Float32Array",
-              "kind": "localName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "TArrayBuffer",
+              "text": "F",
               "kind": "typeParameterName"
             },
             {
@@ -77921,44 +77486,48 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "value",
+              "kind": "parameterName"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Float32Array",
-              "kind": "localName"
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
             },
             {
               "text": ":",
@@ -77969,25 +77538,7 @@
               "kind": "space"
             },
             {
-              "text": "Float32ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "A typed array of 32-bit float values. The contents are initialized to 0. If the requested number\nof bytes could not be allocated an exception is raised.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "Float32ArrayConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -77995,90 +77546,81 @@
               "kind": "space"
             },
             {
-              "text": "Float32ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Float64Array",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Float64Array",
-              "kind": "localName"
+              "text": "=>",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "TArrayBuffer",
-              "kind": "typeParameterName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
-              "kind": "keyword"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "null",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
-            {
-              "text": "Float64Array",
-              "kind": "localName"
-            },
             {
               "text": ":",
               "kind": "punctuation"
@@ -78088,25 +77630,15 @@
               "kind": "space"
             },
             {
-              "text": "Float64ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "V",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "A typed array of 64-bit float values. The contents are initialized to 0. If the requested\nnumber of bytes could not be allocated an exception is raised.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "Float64ArrayConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -78114,20 +77646,7 @@
               "kind": "space"
             },
             {
-              "text": "Float64ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Function",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "object",
               "kind": "keyword"
             },
             {
@@ -78135,24 +77654,36 @@
               "kind": "space"
             },
             {
-              "text": "Function",
-              "kind": "localName"
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
             },
             {
               "text": "\n",
               "kind": "lineBreak"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "    ",
+              "kind": "space"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "Function",
-              "kind": "localName"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
             },
             {
               "text": ":",
@@ -78163,25 +77694,7 @@
               "kind": "space"
             },
             {
-              "text": "FunctionConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Creates a new function.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "FunctionConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -78189,88 +77702,35 @@
               "kind": "space"
             },
             {
-              "text": "FunctionConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "globalThis",
-          "kind": "module",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+              "text": "F",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "module",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "globalThis",
-              "kind": "moduleName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "IArguments",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "IArguments",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ImportAttributes",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ImportAttributes",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "The type for the `with` property of the optional second argument to `import()`.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ImportCallOptions",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -78278,79 +77738,51 @@
               "kind": "space"
             },
             {
-              "text": "ImportCallOptions",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "The type for the optional second argument to `import()`.\n\nIf your host environment supports additional options, this type may be\naugmented via interface merging.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ImportMeta",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": ")",
+              "kind": "punctuation"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ImportMeta",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "any",
+              "kind": "keyword"
+            },
             {
-              "text": "The type of `import.meta`.\n\nIf you need to declare that a given property exists on `import.meta`,\nthis type may be augmented via interface merging.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "infer",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+              "text": ";",
+              "kind": "punctuation"
+            },
             {
-              "text": "infer",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "InstanceType",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "\n",
+              "kind": "lineBreak"
+            },
             {
-              "text": "type",
-              "kind": "keyword"
+              "text": "}",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "InstanceType",
-              "kind": "aliasName"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "T",
+              "text": "F",
               "kind": "typeParameterName"
             },
             {
@@ -78366,15 +77798,23 @@
               "kind": "space"
             },
             {
-              "text": "abstract",
-              "kind": "keyword"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "new",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -78382,9 +77822,17 @@
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
               "kind": "punctuation"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "...",
               "kind": "punctuation"
@@ -78402,9 +77850,17 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "infer",
               "kind": "keyword"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -78425,24 +77881,20 @@
               "text": "any",
               "kind": "keyword"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -78458,7 +77910,7 @@
               "kind": "space"
             },
             {
-              "text": "abstract",
+              "text": "null",
               "kind": "keyword"
             },
             {
@@ -78466,24 +77918,20 @@
               "kind": "space"
             },
             {
-              "text": "new",
-              "kind": "keyword"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "...",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "args",
-              "kind": "parameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": ":",
@@ -78494,27 +77942,23 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
-            },
-            {
-              "text": ")",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "infer",
+              "text": "object",
               "kind": "keyword"
             },
             {
@@ -78522,31 +77966,31 @@
               "kind": "space"
             },
             {
-              "text": "R",
-              "kind": "typeParameterName"
+              "text": "&",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "?",
+              "text": "{",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": "R",
-              "kind": "typeParameterName"
+              "text": "    ",
+              "kind": "space"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": ":",
+              "text": "(",
               "kind": "punctuation"
             },
             {
@@ -78554,79 +77998,59 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "...",
+              "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "Obtain the return type of a constructor function type",
+              "text": "Recursively unwraps the \"awaited type\" of a type. Non-promise \"thenables\" should resolve to `never`. This emulates the behavior of `await`.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Int8Array",
-          "kind": "var",
-          "kindModifiers": "declare",
+          "name": "bigint",
+          "kind": "keyword",
+          "kindModifiers": "",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "interface",
+              "text": "bigint",
               "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "Int8Array",
-              "kind": "localName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "TArrayBuffer",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
+            }
+          ]
+        },
+        {
+          "name": "boolean",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "extends",
+              "text": "boolean",
               "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
+            }
+          ]
+        },
+        {
+          "name": "Boolean",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "interface",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
+              "text": "Boolean",
               "kind": "localName"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": "\n",
               "kind": "lineBreak"
@@ -78640,7 +78064,7 @@
               "kind": "space"
             },
             {
-              "text": "Int8Array",
+              "text": "Boolean",
               "kind": "localName"
             },
             {
@@ -78652,19 +78076,14 @@
               "kind": "space"
             },
             {
-              "text": "Int8ArrayConstructor",
+              "text": "BooleanConstructor",
               "kind": "interfaceName"
             }
           ],
-          "documentation": [
-            {
-              "text": "A typed array of 8-bit integer values. The contents are initialized to 0. If the requested\nnumber of bytes could not be allocated an exception is raised.",
-              "kind": "text"
-            }
-          ]
+          "documentation": []
         },
         {
-          "name": "Int8ArrayConstructor",
+          "name": "BooleanConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -78678,15 +78097,15 @@
               "kind": "space"
             },
             {
-              "text": "Int8ArrayConstructor",
+              "text": "BooleanConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "Int16Array",
-          "kind": "var",
+          "name": "CallableFunction",
+          "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
@@ -78699,91 +78118,84 @@
               "kind": "space"
             },
             {
-              "text": "Int16Array",
-              "kind": "localName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
+              "text": "CallableFunction",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Capitalize",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "TArrayBuffer",
-              "kind": "typeParameterName"
+              "text": "type",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
-              "kind": "keyword"
+              "text": "Capitalize",
+              "kind": "aliasName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "<",
+              "kind": "punctuation"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "S",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "string",
+              "kind": "keyword"
             },
             {
               "text": ">",
               "kind": "punctuation"
             },
-            {
-              "text": "\n",
-              "kind": "lineBreak"
-            },
-            {
-              "text": "var",
-              "kind": "keyword"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Int16Array",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Int16ArrayConstructor",
-              "kind": "interfaceName"
+              "text": "intrinsic",
+              "kind": "keyword"
             }
           ],
           "documentation": [
             {
-              "text": "A typed array of 16-bit signed integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "text": "Convert first character of string literal type to uppercase",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Int16ArrayConstructor",
+          "name": "ClassAccessorDecoratorContext",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -78797,58 +78209,21 @@
               "kind": "space"
             },
             {
-              "text": "Int16ArrayConstructor",
+              "text": "ClassAccessorDecoratorContext",
               "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Int32Array",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "Int32Array",
-              "kind": "localName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "TArrayBuffer",
+              "text": "This",
               "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
-            {
-              "text": "extends",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
             {
               "text": "=",
               "kind": "operator"
@@ -78858,51 +78233,87 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ",",
               "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "Value",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Int32Array",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Int32ArrayConstructor",
-              "kind": "interfaceName"
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "A typed array of 32-bit signed integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "text": "Context provided to a class `accessor` field decorator.",
               "kind": "text"
             }
+          ],
+          "tags": [
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
+                  "kind": "text"
+                }
+              ]
+            },
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type of decorated class field.",
+                  "kind": "text"
+                }
+              ]
+            }
           ]
         },
         {
-          "name": "Int32ArrayConstructor",
+          "name": "ClassAccessorDecoratorResult",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -78916,36 +78327,80 @@
               "kind": "space"
             },
             {
-              "text": "Int32ArrayConstructor",
+              "text": "ClassAccessorDecoratorResult",
               "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Intl",
-          "kind": "module",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+            },
             {
-              "text": "namespace",
-              "kind": "keyword"
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "This",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Intl",
-              "kind": "moduleName"
+              "text": "Value",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "Describes the allowed return value from a class `accessor` field decorator.",
+              "kind": "text"
+            }
+          ],
+          "tags": [
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The `this` type to which the target applies.",
+                  "kind": "text"
+                }
+              ]
+            },
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The property type for the class `accessor` field.",
+                  "kind": "text"
+                }
+              ]
+            }
+          ]
         },
         {
-          "name": "JSON",
-          "kind": "var",
+          "name": "ClassAccessorDecoratorTarget",
+          "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
@@ -78958,27 +78413,19 @@
               "kind": "space"
             },
             {
-              "text": "JSON",
-              "kind": "localName"
-            },
-            {
-              "text": "\n",
-              "kind": "lineBreak"
-            },
-            {
-              "text": "var",
-              "kind": "keyword"
+              "text": "ClassAccessorDecoratorTarget",
+              "kind": "interfaceName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "<",
+              "kind": "punctuation"
             },
             {
-              "text": "JSON",
-              "kind": "localName"
+              "text": "This",
+              "kind": "typeParameterName"
             },
             {
-              "text": ":",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -78986,31 +78433,59 @@
               "kind": "space"
             },
             {
-              "text": "JSON",
-              "kind": "localName"
+              "text": "Value",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.",
+              "text": "Describes the target provided to class `accessor` field decorators.",
               "kind": "text"
             }
-          ]
-        },
-        {
-          "name": "keyof",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+          ],
+          "tags": [
             {
-              "text": "keyof",
-              "kind": "keyword"
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The `this` type to which the target applies.",
+                  "kind": "text"
+                }
+              ]
+            },
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The property type for the class `accessor` field.",
+                  "kind": "text"
+                }
+              ]
             }
           ]
         },
         {
-          "name": "Lowercase",
+          "name": "ClassDecorator",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -79024,15 +78499,27 @@
               "kind": "space"
             },
             {
-              "text": "Lowercase",
+              "text": "ClassDecorator",
               "kind": "aliasName"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "S",
+              "text": "TFunction",
               "kind": "typeParameterName"
             },
             {
@@ -79048,73 +78535,59 @@
               "kind": "space"
             },
             {
-              "text": "string",
-              "kind": "keyword"
+              "text": "Function",
+              "kind": "localName"
             },
             {
               "text": ">",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "target",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "intrinsic",
-              "kind": "keyword"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Convert string literal type to lowercase",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "Math",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "TFunction",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Math",
-              "kind": "localName"
+              "text": "=>",
+              "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "TFunction",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Math",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -79122,25 +78595,20 @@
               "kind": "space"
             },
             {
-              "text": "Math",
-              "kind": "localName"
+              "text": "void",
+              "kind": "keyword"
             }
           ],
-          "documentation": [
-            {
-              "text": "An intrinsic object that provides basic mathematics functionality and constants.",
-              "kind": "text"
-            }
-          ]
+          "documentation": []
         },
         {
-          "name": "MethodDecorator",
-          "kind": "type",
+          "name": "ClassDecoratorContext",
+          "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -79148,39 +78616,55 @@
               "kind": "space"
             },
             {
-              "text": "MethodDecorator",
-              "kind": "aliasName"
+              "text": "ClassDecoratorContext",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "Class",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": "abstract",
+              "kind": "keyword"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
+              "text": "new",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "target",
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
               "kind": "parameterName"
             },
             {
@@ -79192,11 +78676,11 @@
               "kind": "space"
             },
             {
-              "text": "Object",
-              "kind": "localName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": ",",
+              "text": ")",
               "kind": "punctuation"
             },
             {
@@ -79204,11 +78688,7 @@
               "kind": "space"
             },
             {
-              "text": "propertyKey",
-              "kind": "parameterName"
-            },
-            {
-              "text": ":",
+              "text": "=>",
               "kind": "punctuation"
             },
             {
@@ -79216,7 +78696,7 @@
               "kind": "space"
             },
             {
-              "text": "string",
+              "text": "any",
               "kind": "keyword"
             },
             {
@@ -79224,63 +78704,43 @@
               "kind": "space"
             },
             {
-              "text": "|",
-              "kind": "punctuation"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "symbol",
+              "text": "abstract",
               "kind": "keyword"
             },
-            {
-              "text": ",",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "descriptor",
-              "kind": "parameterName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "new",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "TypedPropertyDescriptor",
-              "kind": "interfaceName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": ")",
+              "text": "...",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "=>",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -79288,19 +78748,11 @@
               "kind": "space"
             },
             {
-              "text": "TypedPropertyDescriptor",
-              "kind": "interfaceName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ")",
               "kind": "punctuation"
             },
             {
@@ -79308,7 +78760,7 @@
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": "=>",
               "kind": "punctuation"
             },
             {
@@ -79316,26 +78768,42 @@
               "kind": "space"
             },
             {
-              "text": "void",
+              "text": "any",
               "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             }
           ],
-          "documentation": []
-        },
-        {
-          "name": "never",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+          "documentation": [
             {
-              "text": "never",
-              "kind": "keyword"
+              "text": "Context provided to a class decorator.",
+              "kind": "text"
+            }
+          ],
+          "tags": [
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "Class",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type of the decorated class associated with this context.",
+                  "kind": "text"
+                }
+              ]
             }
           ]
         },
         {
-          "name": "NewableFunction",
+          "name": "ClassFieldDecoratorContext",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -79349,46 +78817,49 @@
               "kind": "space"
             },
             {
-              "text": "NewableFunction",
+              "text": "ClassFieldDecoratorContext",
               "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "NoInfer",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+            },
             {
-              "text": "type",
-              "kind": "keyword"
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "This",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "NoInfer",
-              "kind": "aliasName"
+              "text": "=",
+              "kind": "operator"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ",",
               "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "Value",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "=",
               "kind": "operator"
@@ -79398,25 +78869,65 @@
               "kind": "space"
             },
             {
-              "text": "intrinsic",
+              "text": "unknown",
               "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "Marker for non-inference type position",
+              "text": "Context provided to a class field decorator.",
               "kind": "text"
             }
+          ],
+          "tags": [
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
+                  "kind": "text"
+                }
+              ]
+            },
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type of the decorated class field.",
+                  "kind": "text"
+                }
+              ]
+            }
           ]
         },
         {
-          "name": "NonNullable",
-          "kind": "type",
+          "name": "ClassGetterDecoratorContext",
+          "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -79424,21 +78935,17 @@
               "kind": "space"
             },
             {
-              "text": "NonNullable",
-              "kind": "aliasName"
+              "text": "ClassGetterDecoratorContext",
+              "kind": "interfaceName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "T",
+              "text": "This",
               "kind": "typeParameterName"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
@@ -79452,7 +78959,19 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Value",
               "kind": "typeParameterName"
             },
             {
@@ -79460,61 +78979,73 @@
               "kind": "space"
             },
             {
-              "text": "&",
-              "kind": "punctuation"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "{",
-              "kind": "punctuation"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": "}",
+              "text": ">",
               "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "Exclude null and undefined from T",
+              "text": "Context provided to a class getter decorator.",
               "kind": "text"
             }
-          ]
-        },
-        {
-          "name": "null",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+          ],
+          "tags": [
             {
-              "text": "null",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "number",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
+                  "kind": "text"
+                }
+              ]
+            },
             {
-              "text": "number",
-              "kind": "keyword"
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The property type of the decorated class getter.",
+                  "kind": "text"
+                }
+              ]
             }
           ]
         },
         {
-          "name": "Number",
-          "kind": "var",
+          "name": "ClassMemberDecoratorContext",
+          "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "interface",
+              "text": "type",
               "kind": "keyword"
             },
             {
@@ -79522,27 +79053,35 @@
               "kind": "space"
             },
             {
-              "text": "Number",
-              "kind": "localName"
+              "text": "ClassMemberDecoratorContext",
+              "kind": "aliasName"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Number",
-              "kind": "localName"
+              "text": "ClassMethodDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": ":",
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -79550,86 +79089,55 @@
               "kind": "space"
             },
             {
-              "text": "NumberConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "(",
+              "kind": "punctuation"
+            },
             {
-              "text": "An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "NumberConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "this",
+              "kind": "parameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "NumberConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "object",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "object",
+              "text": "unknown",
               "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Object",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Object",
-              "kind": "localName"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Object",
-              "kind": "localName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": ":",
+              "text": ")",
               "kind": "punctuation"
             },
             {
@@ -79637,63 +79145,44 @@
               "kind": "space"
             },
             {
-              "text": "ObjectConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "=>",
+              "kind": "punctuation"
+            },
             {
-              "text": "Provides functionality common to all JavaScript objects.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ObjectConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
+              "text": "any",
               "kind": "keyword"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ObjectConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Omit",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
-              "kind": "keyword"
+              "text": "|",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Omit",
-              "kind": "aliasName"
+              "text": "ClassGetterDecoratorContext",
+              "kind": "interfaceName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
               "text": ",",
@@ -79704,35 +79193,39 @@
               "kind": "space"
             },
             {
-              "text": "K",
-              "kind": "typeParameterName"
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
-              "kind": "keyword"
+              "text": "|",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "keyof",
-              "kind": "keyword"
+              "text": "ClassSetterDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "<",
+              "kind": "punctuation"
             },
             {
-              "text": "any",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -79740,15 +79233,11 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
-            },
-            {
-              "text": " ",
-              "kind": "space"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": "{",
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -79756,47 +79245,27 @@
               "kind": "space"
             },
             {
-              "text": "[",
+              "text": "|",
               "kind": "punctuation"
             },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "in",
-              "kind": "keyword"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Exclude",
-              "kind": "aliasName"
+              "text": "ClassFieldDecoratorContext",
+              "kind": "interfaceName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "keyof",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "...",
+              "kind": "text"
             },
             {
-              "text": ",",
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -79804,19 +79273,7 @@
               "kind": "space"
             },
             {
-              "text": "K",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
-            {
-              "text": "]",
-              "kind": "punctuation"
-            },
-            {
-              "text": ":",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -79824,49 +79281,37 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "]",
-              "kind": "punctuation"
+              "text": "ClassAccessorDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": ";",
+              "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "...",
+              "kind": "text"
             },
             {
-              "text": "}",
+              "text": ">",
               "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "Construct a type with the properties of T except for those in type K.",
+              "text": "The decorator context types provided to class element decorators.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "OmitThisParameter",
-          "kind": "type",
+          "name": "ClassMethodDecoratorContext",
+          "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -79874,21 +79319,17 @@
               "kind": "space"
             },
             {
-              "text": "OmitThisParameter",
-              "kind": "aliasName"
+              "text": "ClassMethodDecoratorContext",
+              "kind": "interfaceName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "T",
+              "text": "This",
               "kind": "typeParameterName"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
@@ -79906,52 +79347,36 @@
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "extends",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ThisParameterType",
-              "kind": "aliasName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "T",
+              "text": "Value",
               "kind": "typeParameterName"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "?",
-              "kind": "punctuation"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "this",
+              "kind": "parameterName"
             },
             {
               "text": ":",
@@ -79962,25 +79387,17 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "This",
               "kind": "typeParameterName"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "extends",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
-            {
-              "text": "(",
-              "kind": "punctuation"
-            },
             {
               "text": "...",
               "kind": "punctuation"
@@ -79998,17 +79415,9 @@
               "kind": "space"
             },
             {
-              "text": "infer",
+              "text": "any",
               "kind": "keyword"
             },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "A",
-              "kind": "typeParameterName"
-            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -80026,7 +79435,7 @@
               "kind": "space"
             },
             {
-              "text": "infer",
+              "text": "any",
               "kind": "keyword"
             },
             {
@@ -80034,15 +79443,23 @@
               "kind": "space"
             },
             {
-              "text": "R",
-              "kind": "typeParameterName"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "?",
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "this",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -80050,9 +79467,17 @@
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "This",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
               "kind": "punctuation"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "...",
               "kind": "punctuation"
@@ -80070,8 +79495,8 @@
               "kind": "space"
             },
             {
-              "text": "A",
-              "kind": "typeParameterName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
               "text": ")",
@@ -80090,41 +79515,65 @@
               "kind": "space"
             },
             {
-              "text": "R",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": ":",
+              "text": ">",
               "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
             }
           ],
           "documentation": [
             {
-              "text": "Removes the 'this' parameter from a function type.",
+              "text": "Context provided to a class method decorator.",
               "kind": "text"
             }
+          ],
+          "tags": [
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
+                  "kind": "text"
+                }
+              ]
+            },
+            {
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type of the decorated class method.",
+                  "kind": "text"
+                }
+              ]
+            }
           ]
         },
         {
-          "name": "ParameterDecorator",
-          "kind": "type",
+          "name": "ClassSetterDecoratorContext",
+          "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -80132,71 +79581,35 @@
               "kind": "space"
             },
             {
-              "text": "ParameterDecorator",
-              "kind": "aliasName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "=",
-              "kind": "operator"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "target",
-              "kind": "parameterName"
+              "text": "ClassSetterDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": ":",
+              "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "Object",
-              "kind": "localName"
-            },
-            {
-              "text": ",",
-              "kind": "punctuation"
+              "text": "This",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "propertyKey",
-              "kind": "parameterName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "string",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "|",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -80204,74 +79617,108 @@
               "kind": "space"
             },
             {
-              "text": "symbol",
-              "kind": "keyword"
+              "text": "Value",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "|",
-              "kind": "punctuation"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "undefined",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": ",",
+              "text": ">",
               "kind": "punctuation"
-            },
+            }
+          ],
+          "documentation": [
             {
-              "text": " ",
-              "kind": "space"
-            },
+              "text": "Context provided to a class setter decorator.",
+              "kind": "text"
+            }
+          ],
+          "tags": [
             {
-              "text": "parameterIndex",
-              "kind": "parameterName"
+              "name": "template",
+              "text": [
+                {
+                  "text": "This",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type on which the class element will be defined. For a static class element, this will be\nthe type of the constructor. For a non-static class element, this will be the type of the instance.",
+                  "kind": "text"
+                }
+              ]
             },
             {
-              "text": ":",
-              "kind": "punctuation"
+              "name": "template",
+              "text": [
+                {
+                  "text": "Value",
+                  "kind": "typeParameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The type of the decorated class setter.",
+                  "kind": "text"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "ConcatArray",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "number",
-              "kind": "keyword"
+              "text": "ConcatArray",
+              "kind": "interfaceName"
             },
             {
-              "text": ")",
+              "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "T",
+              "kind": "typeParameterName"
             },
             {
-              "text": "=>",
+              "text": ">",
               "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "void",
-              "kind": "keyword"
             }
           ],
           "documentation": []
         },
         {
-          "name": "Parameters",
+          "name": "ConstructorParameters",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -80285,7 +79732,7 @@
               "kind": "space"
             },
             {
-              "text": "Parameters",
+              "text": "ConstructorParameters",
               "kind": "aliasName"
             },
             {
@@ -80308,6 +79755,22 @@
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "abstract",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "new",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "(",
               "kind": "punctuation"
@@ -80384,6 +79847,22 @@
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "abstract",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "new",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "(",
               "kind": "punctuation"
@@ -80471,19 +79950,19 @@
           ],
           "documentation": [
             {
-              "text": "Obtain the parameters of a function type in a tuple",
+              "text": "Obtain the parameters of a constructor function type in a tuple",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Partial",
-          "kind": "type",
+          "name": "DataView",
+          "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -80491,63 +79970,59 @@
               "kind": "space"
             },
             {
-              "text": "Partial",
-              "kind": "aliasName"
+              "text": "DataView",
+              "kind": "localName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "T",
+              "text": "TArrayBuffer",
               "kind": "typeParameterName"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "{",
-              "kind": "punctuation"
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "in",
-              "kind": "keyword"
+              "text": "ArrayBuffer",
+              "kind": "localName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ">",
+              "kind": "punctuation"
             },
             {
-              "text": "keyof",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
               "kind": "keyword"
             },
             {
@@ -80555,16 +80030,8 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "]",
-              "kind": "punctuation"
-            },
-            {
-              "text": "?",
-              "kind": "punctuation"
+              "text": "DataView",
+              "kind": "localName"
             },
             {
               "text": ":",
@@ -80575,93 +80042,41 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "[",
-              "kind": "punctuation"
-            },
+              "text": "DataViewConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "DataViewConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "P",
-              "kind": "typeParameterName"
+              "text": "interface",
+              "kind": "keyword"
             },
             {
-              "text": "]",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ";",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "}",
-              "kind": "punctuation"
+              "text": "DataViewConstructor",
+              "kind": "interfaceName"
             }
           ],
-          "documentation": [
-            {
-              "text": "Make all properties in T optional",
-              "kind": "text"
-            }
-          ]
+          "documentation": []
         },
         {
-          "name": "Pick",
-          "kind": "type",
+          "name": "Date",
+          "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "Pick",
-              "kind": "aliasName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ",",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "K",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "extends",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "keyof",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -80669,47 +80084,15 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "=",
-              "kind": "operator"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "{",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
+              "text": "Date",
+              "kind": "localName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": "in",
+              "text": "var",
               "kind": "keyword"
             },
             {
@@ -80717,12 +80100,8 @@
               "kind": "space"
             },
             {
-              "text": "K",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "]",
-              "kind": "punctuation"
+              "text": "Date",
+              "kind": "localName"
             },
             {
               "text": ":",
@@ -80733,43 +80112,19 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "]",
-              "kind": "punctuation"
-            },
-            {
-              "text": ";",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "}",
-              "kind": "punctuation"
+              "text": "DateConstructor",
+              "kind": "interfaceName"
             }
           ],
           "documentation": [
             {
-              "text": "From T, pick a set of properties whose keys are in the union K",
+              "text": "Enables basic storage and retrieval of dates and times.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Promise",
+          "name": "DateConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -80783,31 +80138,14 @@
               "kind": "space"
             },
             {
-              "text": "Promise",
+              "text": "DateConstructor",
               "kind": "interfaceName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
             }
           ],
-          "documentation": [
-            {
-              "text": "Represents the completion of an asynchronous operation",
-              "kind": "text"
-            }
-          ]
+          "documentation": []
         },
         {
-          "name": "PromiseConstructorLike",
+          "name": "DecoratorContext",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -80821,7 +80159,7 @@
               "kind": "space"
             },
             {
-              "text": "PromiseConstructorLike",
+              "text": "DecoratorContext",
               "kind": "aliasName"
             },
             {
@@ -80837,31 +80175,35 @@
               "kind": "space"
             },
             {
-              "text": "new",
-              "kind": "keyword"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "ClassMethodDecoratorContext",
+              "kind": "interfaceName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ",",
               "kind": "punctuation"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "executor",
+              "text": "this",
               "kind": "parameterName"
             },
             {
@@ -80873,15 +80215,11 @@
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "resolve",
-              "kind": "parameterName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": ":",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -80889,11 +80227,11 @@
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "...",
               "kind": "punctuation"
             },
             {
-              "text": "value",
+              "text": "args",
               "kind": "parameterName"
             },
             {
@@ -80905,15 +80243,19 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": "=>",
               "kind": "punctuation"
             },
             {
@@ -80921,23 +80263,19 @@
               "kind": "space"
             },
             {
-              "text": "PromiseLike",
-              "kind": "interfaceName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": "<",
+              "text": ">",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ")",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -80945,15 +80283,15 @@
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "ClassGetterDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "<",
+              "kind": "punctuation"
             },
             {
-              "text": "void",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
@@ -80965,11 +80303,11 @@
               "kind": "space"
             },
             {
-              "text": "reject",
-              "kind": "parameterName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": ":",
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -80977,19 +80315,7 @@
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "reason",
-              "kind": "parameterName"
-            },
-            {
-              "text": "?",
-              "kind": "punctuation"
-            },
-            {
-              "text": ":",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -80997,19 +80323,19 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "ClassSetterDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": ")",
+              "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": "=>",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -81017,11 +80343,11 @@
               "kind": "space"
             },
             {
-              "text": "void",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": ")",
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -81029,7 +80355,7 @@
               "kind": "space"
             },
             {
-              "text": "=>",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -81037,11 +80363,19 @@
               "kind": "space"
             },
             {
-              "text": "void",
-              "kind": "keyword"
+              "text": "ClassFieldDecoratorContext",
+              "kind": "interfaceName"
             },
             {
-              "text": ")",
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "text"
+            },
+            {
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -81049,7 +80383,7 @@
               "kind": "space"
             },
             {
-              "text": "=>",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -81057,7 +80391,7 @@
               "kind": "space"
             },
             {
-              "text": "PromiseLike",
+              "text": "ClassAccessorDecoratorContext",
               "kind": "interfaceName"
             },
             {
@@ -81065,32 +80399,31 @@
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "...",
+              "kind": "text"
             },
             {
               "text": ">",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "PromiseLike",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "PromiseLike",
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ClassDecoratorContext",
               "kind": "interfaceName"
             },
             {
@@ -81098,18 +80431,23 @@
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "...",
+              "kind": "text"
             },
             {
               "text": ">",
               "kind": "punctuation"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "The decorator context types provided to any decorator.",
+              "kind": "text"
+            }
+          ]
         },
         {
-          "name": "PropertyDecorator",
+          "name": "DecoratorMetadata",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -81123,7 +80461,7 @@
               "kind": "space"
             },
             {
-              "text": "PropertyDecorator",
+              "text": "DecoratorMetadata",
               "kind": "aliasName"
             },
             {
@@ -81139,35 +80477,23 @@
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "{",
               "kind": "punctuation"
             },
             {
-              "text": "target",
-              "kind": "parameterName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "Object",
-              "kind": "localName"
-            },
-            {
-              "text": ",",
+              "text": "[",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "propertyKey",
+              "text": "x",
               "kind": "parameterName"
             },
             {
@@ -81183,11 +80509,11 @@
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "]",
+              "kind": "punctuation"
             },
             {
-              "text": "|",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -81195,19 +80521,31 @@
               "kind": "space"
             },
             {
-              "text": "symbol",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": ")",
+              "text": ";",
               "kind": "punctuation"
             },
             {
-              "text": " ",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "=>",
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "x",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -81215,94 +80553,63 @@
               "kind": "space"
             },
             {
-              "text": "void",
+              "text": "number",
               "kind": "keyword"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "PropertyDescriptor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "PropertyDescriptor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "PropertyDescriptorMap",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ";",
+              "kind": "punctuation"
             },
             {
-              "text": "PropertyDescriptorMap",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "PropertyKey",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "PropertyKey",
-              "kind": "aliasName"
+              "text": "[",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "x",
+              "kind": "parameterName"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "string",
+              "text": "symbol",
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "]",
+              "kind": "punctuation"
             },
             {
-              "text": "|",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -81310,15 +80617,27 @@
               "kind": "space"
             },
             {
-              "text": "number",
+              "text": "unknown",
               "kind": "keyword"
             },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "|",
+              "text": "&",
               "kind": "punctuation"
             },
             {
@@ -81326,20 +80645,20 @@
               "kind": "space"
             },
             {
-              "text": "symbol",
+              "text": "object",
               "kind": "keyword"
             }
           ],
           "documentation": []
         },
         {
-          "name": "RangeError",
-          "kind": "var",
+          "name": "DecoratorMetadataObject",
+          "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "interface",
+              "text": "type",
               "kind": "keyword"
             },
             {
@@ -81347,110 +80666,16 @@
               "kind": "space"
             },
             {
-              "text": "RangeError",
-              "kind": "localName"
+              "text": "DecoratorMetadataObject",
+              "kind": "aliasName"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "RangeError",
-              "kind": "localName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "RangeErrorConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "RangeErrorConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "RangeErrorConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "readonly",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "readonly",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Readonly",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "Readonly",
-              "kind": "aliasName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "=",
-              "kind": "operator"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
@@ -81461,15 +80686,11 @@
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "readonly",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
@@ -81477,33 +80698,21 @@
               "kind": "punctuation"
             },
             {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": " ",
-              "kind": "space"
+              "text": "x",
+              "kind": "parameterName"
             },
             {
-              "text": "in",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "keyof",
+              "text": "string",
               "kind": "keyword"
             },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
             {
               "text": "]",
               "kind": "punctuation"
@@ -81517,138 +80726,79 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "]",
-              "kind": "punctuation"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
               "text": ";",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "}",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Make all properties in T readonly",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ReadonlyArray",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "ReadonlyArray",
-              "kind": "interfaceName"
-            },
-            {
-              "text": "<",
+              "text": "[",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "x",
+              "kind": "parameterName"
             },
             {
-              "text": ">",
+              "text": ":",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Record",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "type",
-              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Record",
-              "kind": "aliasName"
+              "text": "number",
+              "kind": "keyword"
             },
             {
-              "text": "<",
+              "text": "]",
               "kind": "punctuation"
             },
             {
-              "text": "K",
-              "kind": "typeParameterName"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": ";",
+              "kind": "punctuation"
             },
             {
-              "text": "keyof",
-              "kind": "keyword"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": " ",
+              "text": "    ",
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
-            },
-            {
-              "text": ",",
+              "text": "[",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "x",
+              "kind": "parameterName"
             },
             {
-              "text": ">",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -81656,51 +80806,35 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
-            },
-            {
-              "text": " ",
-              "kind": "space"
+              "text": "symbol",
+              "kind": "keyword"
             },
             {
-              "text": "{",
+              "text": "]",
               "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "[",
+              "text": ":",
               "kind": "punctuation"
             },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "in",
+              "text": "unknown",
               "kind": "keyword"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "K",
-              "kind": "typeParameterName"
+              "text": ";",
+              "kind": "punctuation"
             },
             {
-              "text": "]",
-              "kind": "punctuation"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": ":",
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -81708,11 +80842,7 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": ";",
+              "text": "&",
               "kind": "punctuation"
             },
             {
@@ -81720,19 +80850,14 @@
               "kind": "space"
             },
             {
-              "text": "}",
-              "kind": "punctuation"
+              "text": "object",
+              "kind": "keyword"
             }
           ],
-          "documentation": [
-            {
-              "text": "Construct a type with a set of properties K of type T",
-              "kind": "text"
-            }
-          ]
+          "documentation": []
         },
         {
-          "name": "ReferenceError",
+          "name": "Error",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -81746,7 +80871,7 @@
               "kind": "space"
             },
             {
-              "text": "ReferenceError",
+              "text": "Error",
               "kind": "localName"
             },
             {
@@ -81762,7 +80887,7 @@
               "kind": "space"
             },
             {
-              "text": "ReferenceError",
+              "text": "Error",
               "kind": "localName"
             },
             {
@@ -81774,14 +80899,14 @@
               "kind": "space"
             },
             {
-              "text": "ReferenceErrorConstructor",
+              "text": "ErrorConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "ReferenceErrorConstructor",
+          "name": "ErrorConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -81795,14 +80920,14 @@
               "kind": "space"
             },
             {
-              "text": "ReferenceErrorConstructor",
+              "text": "ErrorConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "RegExp",
+          "name": "EvalError",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -81816,7 +80941,7 @@
               "kind": "space"
             },
             {
-              "text": "RegExp",
+              "text": "EvalError",
               "kind": "localName"
             },
             {
@@ -81832,7 +80957,7 @@
               "kind": "space"
             },
             {
-              "text": "RegExp",
+              "text": "EvalError",
               "kind": "localName"
             },
             {
@@ -81844,56 +80969,14 @@
               "kind": "space"
             },
             {
-              "text": "RegExpConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "RegExpConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "RegExpConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "RegExpExecArray",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "RegExpExecArray",
+              "text": "EvalErrorConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "RegExpMatchArray",
+          "name": "EvalErrorConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -81907,14 +80990,14 @@
               "kind": "space"
             },
             {
-              "text": "RegExpMatchArray",
+              "text": "EvalErrorConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "Required",
+          "name": "Exclude",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -81928,7 +81011,7 @@
               "kind": "space"
             },
             {
-              "text": "Required",
+              "text": "Exclude",
               "kind": "aliasName"
             },
             {
@@ -81940,7 +81023,7 @@
               "kind": "typeParameterName"
             },
             {
-              "text": ">",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -81948,15 +81031,11 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
-            },
-            {
-              "text": " ",
-              "kind": "space"
+              "text": "U",
+              "kind": "typeParameterName"
             },
             {
-              "text": "{",
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -81964,27 +81043,23 @@
               "kind": "space"
             },
             {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "in",
-              "kind": "keyword"
+              "text": "T",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "keyof",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -81992,47 +81067,31 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "U",
               "kind": "typeParameterName"
             },
             {
-              "text": "]",
-              "kind": "punctuation"
-            },
-            {
-              "text": "-",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": "?",
               "kind": "punctuation"
             },
-            {
-              "text": ":",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
-            },
-            {
-              "text": "[",
-              "kind": "punctuation"
-            },
-            {
-              "text": "P",
-              "kind": "typeParameterName"
+              "text": "never",
+              "kind": "keyword"
             },
             {
-              "text": "]",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ";",
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -82040,19 +81099,19 @@
               "kind": "space"
             },
             {
-              "text": "}",
-              "kind": "punctuation"
+              "text": "T",
+              "kind": "typeParameterName"
             }
           ],
           "documentation": [
             {
-              "text": "Make all properties in T required",
+              "text": "Exclude from T those types that are assignable to U",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "ReturnType",
+          "name": "Extract",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82066,7 +81125,7 @@
               "kind": "space"
             },
             {
-              "text": "ReturnType",
+              "text": "Extract",
               "kind": "aliasName"
             },
             {
@@ -82078,51 +81137,7 @@
               "kind": "typeParameterName"
             },
             {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "extends",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "...",
-              "kind": "punctuation"
-            },
-            {
-              "text": "args",
-              "kind": "parameterName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "any",
-              "kind": "keyword"
-            },
-            {
-              "text": ")",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "=>",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -82130,8 +81145,8 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "U",
+              "kind": "typeParameterName"
             },
             {
               "text": ">",
@@ -82166,31 +81181,15 @@
               "kind": "space"
             },
             {
-              "text": "(",
-              "kind": "punctuation"
-            },
-            {
-              "text": "...",
-              "kind": "punctuation"
-            },
-            {
-              "text": "args",
-              "kind": "parameterName"
-            },
-            {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "U",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
-            },
-            {
-              "text": ")",
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -82198,45 +81197,123 @@
               "kind": "space"
             },
             {
-              "text": "=>",
-              "kind": "punctuation"
+              "text": "T",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "infer",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "R",
-              "kind": "typeParameterName"
-            },
+              "text": "never",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
             {
-              "text": " ",
+              "text": "Extract from T those types that are assignable to U",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "false",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "false",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Float32Array",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
               "kind": "space"
             },
             {
-              "text": "?",
+              "text": "Float32Array",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
               "kind": "punctuation"
             },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "R",
-              "kind": "typeParameterName"
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "Float32Array",
+              "kind": "localName"
+            },
             {
               "text": ":",
               "kind": "punctuation"
@@ -82246,31 +81323,40 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "Float32ArrayConstructor",
+              "kind": "interfaceName"
             }
           ],
           "documentation": [
             {
-              "text": "Obtain the return type of a function type",
+              "text": "A typed array of 32-bit float values. The contents are initialized to 0. If the requested number\nof bytes could not be allocated an exception is raised.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "string",
-          "kind": "keyword",
-          "kindModifiers": "",
+          "name": "Float32ArrayConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "string",
+              "text": "interface",
               "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Float32ArrayConstructor",
+              "kind": "interfaceName"
             }
-          ]
+          ],
+          "documentation": []
         },
         {
-          "name": "String",
+          "name": "Float64Array",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82284,9 +81370,53 @@
               "kind": "space"
             },
             {
-              "text": "String",
+              "text": "Float64Array",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
               "kind": "localName"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
             {
               "text": "\n",
               "kind": "lineBreak"
@@ -82300,7 +81430,7 @@
               "kind": "space"
             },
             {
-              "text": "String",
+              "text": "Float64Array",
               "kind": "localName"
             },
             {
@@ -82312,19 +81442,19 @@
               "kind": "space"
             },
             {
-              "text": "StringConstructor",
+              "text": "Float64ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": [
             {
-              "text": "Allows manipulation and formatting of text strings and determination and location of substrings within strings.",
+              "text": "A typed array of 64-bit float values. The contents are initialized to 0. If the requested\nnumber of bytes could not be allocated an exception is raised.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "StringConstructor",
+          "name": "Float64ArrayConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82338,26 +81468,68 @@
               "kind": "space"
             },
             {
-              "text": "StringConstructor",
+              "text": "Float64ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "symbol",
-          "kind": "keyword",
-          "kindModifiers": "",
+          "name": "Function",
+          "kind": "var",
+          "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "symbol",
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Function",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
               "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Function",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "FunctionConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Creates a new function.",
+              "kind": "text"
             }
           ]
         },
         {
-          "name": "Symbol",
+          "name": "FunctionConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82371,20 +81543,20 @@
               "kind": "space"
             },
             {
-              "text": "Symbol",
+              "text": "FunctionConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "SyntaxError",
-          "kind": "var",
-          "kindModifiers": "declare",
+          "name": "globalThis",
+          "kind": "module",
+          "kindModifiers": "",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "interface",
+              "text": "module",
               "kind": "keyword"
             },
             {
@@ -82392,15 +81564,20 @@
               "kind": "space"
             },
             {
-              "text": "SyntaxError",
-              "kind": "localName"
-            },
-            {
-              "text": "\n",
-              "kind": "lineBreak"
-            },
+              "text": "globalThis",
+              "kind": "moduleName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "IArguments",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "var",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -82408,26 +81585,40 @@
               "kind": "space"
             },
             {
-              "text": "SyntaxError",
-              "kind": "localName"
-            },
+              "text": "IArguments",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ImportAttributes",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": ":",
-              "kind": "punctuation"
+              "text": "interface",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "SyntaxErrorConstructor",
+              "text": "ImportAttributes",
               "kind": "interfaceName"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "The type for the `with` property of the optional second argument to `import()`.",
+              "kind": "text"
+            }
+          ]
         },
         {
-          "name": "SyntaxErrorConstructor",
+          "name": "ImportCallOptions",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82441,14 +81632,19 @@
               "kind": "space"
             },
             {
-              "text": "SyntaxErrorConstructor",
+              "text": "ImportCallOptions",
               "kind": "interfaceName"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "The type for the optional second argument to `import()`.\n\nIf your host environment supports additional options, this type may be\naugmented via interface merging.",
+              "kind": "text"
+            }
+          ]
         },
         {
-          "name": "TemplateStringsArray",
+          "name": "ImportMeta",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82462,14 +81658,31 @@
               "kind": "space"
             },
             {
-              "text": "TemplateStringsArray",
+              "text": "ImportMeta",
               "kind": "interfaceName"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "The type of `import.meta`.\n\nIf you need to declare that a given property exists on `import.meta`,\nthis type may be augmented via interface merging.",
+              "kind": "text"
+            }
+          ]
         },
         {
-          "name": "ThisParameterType",
+          "name": "infer",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "infer",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "InstanceType",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82483,7 +81696,7 @@
               "kind": "space"
             },
             {
-              "text": "ThisParameterType",
+              "text": "InstanceType",
               "kind": "aliasName"
             },
             {
@@ -82494,32 +81707,28 @@
               "text": "T",
               "kind": "typeParameterName"
             },
-            {
-              "text": ">",
-              "kind": "punctuation"
-            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "abstract",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "new",
               "kind": "keyword"
             },
             {
@@ -82531,7 +81740,11 @@
               "kind": "punctuation"
             },
             {
-              "text": "this",
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
               "kind": "parameterName"
             },
             {
@@ -82543,25 +81756,81 @@
               "kind": "space"
             },
             {
-              "text": "infer",
+              "text": "any",
               "kind": "keyword"
             },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "U",
-              "kind": "typeParameterName"
+              "text": "=>",
+              "kind": "punctuation"
             },
             {
-              "text": ",",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
               "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "abstract",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "new",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
             {
               "text": "...",
               "kind": "punctuation"
@@ -82579,7 +81848,7 @@
               "kind": "space"
             },
             {
-              "text": "never",
+              "text": "any",
               "kind": "keyword"
             },
             {
@@ -82599,13 +81868,21 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "infer",
               "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "R",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": "?",
               "kind": "punctuation"
@@ -82615,7 +81892,7 @@
               "kind": "space"
             },
             {
-              "text": "U",
+              "text": "R",
               "kind": "typeParameterName"
             },
             {
@@ -82631,20 +81908,20 @@
               "kind": "space"
             },
             {
-              "text": "unknown",
+              "text": "any",
               "kind": "keyword"
             }
           ],
           "documentation": [
             {
-              "text": "Extracts the type of the 'this' parameter of a function type, or 'unknown' if the function type has no 'this' parameter.",
+              "text": "Obtain the return type of a constructor function type",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "ThisType",
-          "kind": "interface",
+          "name": "Int8Array",
+          "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
@@ -82657,49 +81934,23 @@
               "kind": "space"
             },
             {
-              "text": "ThisType",
-              "kind": "interfaceName"
+              "text": "Int8Array",
+              "kind": "localName"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "T",
+              "text": "TArrayBuffer",
               "kind": "typeParameterName"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Marker for contextual 'this' type",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "true",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "true",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "TypedPropertyDescriptor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -82707,42 +81958,29 @@
               "kind": "space"
             },
             {
-              "text": "TypedPropertyDescriptor",
-              "kind": "interfaceName"
-            },
-            {
-              "text": "<",
-              "kind": "punctuation"
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "TypeError",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "TypeError",
+              "text": "ArrayBuffer",
               "kind": "localName"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
             {
               "text": "\n",
               "kind": "lineBreak"
@@ -82756,7 +81994,7 @@
               "kind": "space"
             },
             {
-              "text": "TypeError",
+              "text": "Int8Array",
               "kind": "localName"
             },
             {
@@ -82768,14 +82006,19 @@
               "kind": "space"
             },
             {
-              "text": "TypeErrorConstructor",
+              "text": "Int8ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "A typed array of 8-bit integer values. The contents are initialized to 0. If the requested\nnumber of bytes could not be allocated an exception is raised.",
+              "kind": "text"
+            }
+          ]
         },
         {
-          "name": "TypeErrorConstructor",
+          "name": "Int8ArrayConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82789,26 +82032,14 @@
               "kind": "space"
             },
             {
-              "text": "TypeErrorConstructor",
+              "text": "Int8ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "typeof",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "typeof",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Uint8Array",
+          "name": "Int16Array",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82822,7 +82053,7 @@
               "kind": "space"
             },
             {
-              "text": "Uint8Array",
+              "text": "Int16Array",
               "kind": "localName"
             },
             {
@@ -82882,7 +82113,7 @@
               "kind": "space"
             },
             {
-              "text": "Uint8Array",
+              "text": "Int16Array",
               "kind": "localName"
             },
             {
@@ -82894,19 +82125,19 @@
               "kind": "space"
             },
             {
-              "text": "Uint8ArrayConstructor",
+              "text": "Int16ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": [
             {
-              "text": "A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "text": "A typed array of 16-bit signed integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Uint8ArrayConstructor",
+          "name": "Int16ArrayConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82920,14 +82151,14 @@
               "kind": "space"
             },
             {
-              "text": "Uint8ArrayConstructor",
+              "text": "Int16ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "Uint8ClampedArray",
+          "name": "Int32Array",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -82941,7 +82172,7 @@
               "kind": "space"
             },
             {
-              "text": "Uint8ClampedArray",
+              "text": "Int32Array",
               "kind": "localName"
             },
             {
@@ -83001,7 +82232,7 @@
               "kind": "space"
             },
             {
-              "text": "Uint8ClampedArray",
+              "text": "Int32Array",
               "kind": "localName"
             },
             {
@@ -83013,19 +82244,19 @@
               "kind": "space"
             },
             {
-              "text": "Uint8ClampedArrayConstructor",
+              "text": "Int32ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": [
             {
-              "text": "A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0.\nIf the requested number of bytes could not be allocated an exception is raised.",
+              "text": "A typed array of 32-bit signed integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Uint8ClampedArrayConstructor",
+          "name": "Int32ArrayConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83039,14 +82270,35 @@
               "kind": "space"
             },
             {
-              "text": "Uint8ClampedArrayConstructor",
+              "text": "Int32ArrayConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "Uint16Array",
+          "name": "Intl",
+          "kind": "module",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "namespace",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Intl",
+              "kind": "moduleName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "JSON",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83060,15 +82312,81 @@
               "kind": "space"
             },
             {
-              "text": "Uint16Array",
+              "text": "JSON",
               "kind": "localName"
             },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "JSON",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "JSON",
+              "kind": "localName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "keyof",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Lowercase",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Lowercase",
+              "kind": "aliasName"
+            },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "TArrayBuffer",
+              "text": "S",
               "kind": "typeParameterName"
             },
             {
@@ -83084,8 +82402,12 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             },
             {
               "text": " ",
@@ -83100,12 +82422,34 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "intrinsic",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Convert string literal type to lowercase",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Math",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Math",
+              "kind": "localName"
             },
             {
               "text": "\n",
@@ -83120,7 +82464,7 @@
               "kind": "space"
             },
             {
-              "text": "Uint16Array",
+              "text": "Math",
               "kind": "localName"
             },
             {
@@ -83132,25 +82476,25 @@
               "kind": "space"
             },
             {
-              "text": "Uint16ArrayConstructor",
-              "kind": "interfaceName"
+              "text": "Math",
+              "kind": "localName"
             }
           ],
           "documentation": [
             {
-              "text": "A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "text": "An intrinsic object that provides basic mathematics functionality and constants.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "Uint16ArrayConstructor",
-          "kind": "interface",
+          "name": "MethodDecorator",
+          "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "interface",
+              "text": "type",
               "kind": "keyword"
             },
             {
@@ -83158,44 +82502,75 @@
               "kind": "space"
             },
             {
-              "text": "Uint16ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "Uint32Array",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "MethodDecorator",
+              "kind": "aliasName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Uint32Array",
-              "kind": "localName"
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
             },
             {
               "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "TArrayBuffer",
+              "text": "T",
               "kind": "typeParameterName"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "target",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
+              "text": "Object",
+              "kind": "localName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "propertyKey",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
               "kind": "keyword"
             },
             {
@@ -83203,47 +82578,83 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "|",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "symbol",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "descriptor",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TypedPropertyDescriptor",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
             },
             {
               "text": ">",
               "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": ")",
+              "kind": "punctuation"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Uint32Array",
-              "kind": "localName"
+              "text": "TypedPropertyDescriptor",
+              "kind": "interfaceName"
             },
             {
-              "text": ":",
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
               "kind": "punctuation"
             },
             {
@@ -83251,19 +82662,34 @@
               "kind": "space"
             },
             {
-              "text": "Uint32ArrayConstructor",
-              "kind": "interfaceName"
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
             }
           ],
-          "documentation": [
+          "documentation": []
+        },
+        {
+          "name": "never",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
-              "kind": "text"
+              "text": "never",
+              "kind": "keyword"
             }
           ]
         },
         {
-          "name": "Uint32ArrayConstructor",
+          "name": "NewableFunction",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83277,14 +82703,14 @@
               "kind": "space"
             },
             {
-              "text": "Uint32ArrayConstructor",
+              "text": "NewableFunction",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "Uncapitalize",
+          "name": "NoInfer",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83298,7 +82724,7 @@
               "kind": "space"
             },
             {
-              "text": "Uncapitalize",
+              "text": "NoInfer",
               "kind": "aliasName"
             },
             {
@@ -83306,25 +82732,9 @@
               "kind": "punctuation"
             },
             {
-              "text": "S",
+              "text": "T",
               "kind": "typeParameterName"
             },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "extends",
-              "kind": "keyword"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "string",
-              "kind": "keyword"
-            },
             {
               "text": ">",
               "kind": "punctuation"
@@ -83348,49 +82758,13 @@
           ],
           "documentation": [
             {
-              "text": "Convert first character of string literal type to lowercase",
+              "text": "Marker for non-inference type position",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "undefined",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "undefined",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "unique",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "unique",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "unknown",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "unknown",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Uppercase",
+          "name": "NonNullable",
           "kind": "type",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83404,7 +82778,7 @@
               "kind": "space"
             },
             {
-              "text": "Uppercase",
+              "text": "NonNullable",
               "kind": "aliasName"
             },
             {
@@ -83412,55 +82786,83 @@
               "kind": "punctuation"
             },
             {
-              "text": "S",
+              "text": "T",
               "kind": "typeParameterName"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
-              "kind": "keyword"
+              "text": "=",
+              "kind": "operator"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "string",
-              "kind": "keyword"
-            },
-            {
-              "text": ">",
-              "kind": "punctuation"
+              "text": "T",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "&",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "intrinsic",
-              "kind": "keyword"
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
             }
           ],
           "documentation": [
             {
-              "text": "Convert string literal type to uppercase",
+              "text": "Exclude null and undefined from T",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "URIError",
+          "name": "null",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "null",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "number",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "number",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Number",
           "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83474,7 +82876,7 @@
               "kind": "space"
             },
             {
-              "text": "URIError",
+              "text": "Number",
               "kind": "localName"
             },
             {
@@ -83490,7 +82892,7 @@
               "kind": "space"
             },
             {
-              "text": "URIError",
+              "text": "Number",
               "kind": "localName"
             },
             {
@@ -83502,14 +82904,19 @@
               "kind": "space"
             },
             {
-              "text": "URIErrorConstructor",
+              "text": "NumberConstructor",
               "kind": "interfaceName"
             }
           ],
-          "documentation": []
+          "documentation": [
+            {
+              "text": "An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers.",
+              "kind": "text"
+            }
+          ]
         },
         {
-          "name": "URIErrorConstructor",
+          "name": "NumberConstructor",
           "kind": "interface",
           "kindModifiers": "declare",
           "sortText": "15",
@@ -83523,32 +82930,32 @@
               "kind": "space"
             },
             {
-              "text": "URIErrorConstructor",
+              "text": "NumberConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": []
         },
         {
-          "name": "void",
+          "name": "object",
           "kind": "keyword",
           "kindModifiers": "",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "void",
+              "text": "object",
               "kind": "keyword"
             }
           ]
         },
         {
-          "name": "WeakKey",
-          "kind": "type",
+          "name": "Object",
+          "kind": "var",
           "kindModifiers": "declare",
           "sortText": "15",
           "displayParts": [
             {
-              "text": "type",
+              "text": "interface",
               "kind": "keyword"
             },
             {
@@ -83556,59 +82963,50 @@
               "kind": "space"
             },
             {
-              "text": "WeakKey",
-              "kind": "aliasName"
+              "text": "Object",
+              "kind": "localName"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "\n",
+              "kind": "lineBreak"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "var",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "object",
-              "kind": "keyword"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "WeakKeyTypes",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "Object",
+              "kind": "localName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "WeakKeyTypes",
+              "text": "ObjectConstructor",
               "kind": "interfaceName"
             }
           ],
           "documentation": [
             {
-              "text": "Stores types to be used with WeakSet, WeakMap, WeakRef, and FinalizationRegistry",
+              "text": "Provides functionality common to all JavaScript objects.",
               "kind": "text"
             }
           ]
         },
         {
-          "name": "ImportAssertions",
+          "name": "ObjectConstructor",
           "kind": "interface",
-          "kindModifiers": "deprecated,declare",
-          "sortText": "z15",
+          "kindModifiers": "declare",
+          "sortText": "15",
           "displayParts": [
             {
               "text": "interface",
@@ -83619,54 +83017,242 @@
               "kind": "space"
             },
             {
-              "text": "ImportAssertions",
+              "text": "ObjectConstructor",
               "kind": "interfaceName"
             }
           ],
-          "documentation": [
+          "documentation": []
+        },
+        {
+          "name": "Omit",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
             {
-              "text": "The type for the `assert` property of the optional second argument to `import()`.",
-              "kind": "text"
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Omit",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "K",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "in",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "K",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "never",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
             }
           ],
-          "tags": [
+          "documentation": [
             {
-              "name": "deprecated"
+              "text": "Construct a type with the properties of T except for those in type K.",
+              "kind": "text"
             }
           ]
-        }
-      ],
-      "defaultCommitCharacters": [
-        ".",
-        ",",
-        ";"
-      ]
-    }
-  },
-  {
-    "marker": {
-      "fileName": "/tests/cases/fourslash/completionsCommitCharactersGlobal.ts",
-      "position": 481,
-      "name": "20"
-    },
-    "item": {
-      "flags": 0,
-      "isGlobalCompletion": false,
-      "isMemberCompletion": false,
-      "isNewIdentifierLocation": true,
-      "optionalReplacementSpan": {
-        "start": 480,
-        "length": 1
-      },
-      "entries": [
+        },
         {
-          "name": "C",
-          "kind": "class",
-          "kindModifiers": "",
-          "sortText": "11",
+          "name": "OmitThisParameter",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
           "displayParts": [
             {
-              "text": "class",
+              "text": "type",
               "kind": "keyword"
             },
             {
@@ -83674,20 +83260,219 @@
               "kind": "space"
             },
             {
-              "text": "C",
-              "kind": "className"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "I",
-          "kind": "interface",
-          "kindModifiers": "",
-          "sortText": "11",
-          "displayParts": [
+              "text": "OmitThisParameter",
+              "kind": "aliasName"
+            },
             {
-              "text": "interface",
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "this",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "U",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "never",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "U",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -83695,32 +83480,6596 @@
               "kind": "space"
             },
             {
-              "text": "I",
-              "kind": "interfaceName"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "A",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "R",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "A",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "R",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Removes the 'this' parameter from a function type.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ParameterDecorator",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ParameterDecorator",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "target",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Object",
+              "kind": "localName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "propertyKey",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "symbol",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "parameterIndex",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "number",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Parameters",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Parameters",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "never",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Obtain the parameters of a function type in a tuple",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Partial",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Partial",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "in",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Make all properties in T optional",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Pick",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Pick",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "K",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "in",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "K",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "From T, pick a set of properties whose keys are in the union K",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Promise",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Promise",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Represents the completion of an asynchronous operation",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "PromiseConstructorLike",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PromiseConstructorLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "new",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "executor",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "resolve",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PromiseLike",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "reject",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "reason",
+              "kind": "parameterName"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PromiseLike",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "PromiseLike",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PromiseLike",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "PropertyDecorator",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PropertyDecorator",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "target",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Object",
+              "kind": "localName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "propertyKey",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "symbol",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "PropertyDescriptor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PropertyDescriptor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "PropertyDescriptorMap",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PropertyDescriptorMap",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "PropertyKey",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "PropertyKey",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "number",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "symbol",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "RangeError",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RangeError",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RangeError",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RangeErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "RangeErrorConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RangeErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "readonly",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "readonly",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Readonly",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Readonly",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "readonly",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "in",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Make all properties in T readonly",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ReadonlyArray",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ReadonlyArray",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Record",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Record",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "K",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "in",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "K",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Construct a type with a set of properties K of type T",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ReferenceError",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ReferenceError",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ReferenceError",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ReferenceErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ReferenceErrorConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ReferenceErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "RegExp",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RegExp",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RegExp",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RegExpConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "RegExpConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RegExpConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "RegExpExecArray",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RegExpExecArray",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "RegExpMatchArray",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "RegExpMatchArray",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Required",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Required",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "in",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": "-",
+              "kind": "punctuation"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "P",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Make all properties in T required",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ReturnType",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ReturnType",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "R",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "R",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Obtain the return type of a function type",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "string",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "string",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "String",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "String",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "String",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "StringConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Allows manipulation and formatting of text strings and determination and location of substrings within strings.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "StringConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "StringConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "symbol",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "symbol",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Symbol",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Symbol",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "SyntaxError",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "SyntaxError",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "SyntaxError",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "SyntaxErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "SyntaxErrorConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "SyntaxErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "TemplateStringsArray",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TemplateStringsArray",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ThisParameterType",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ThisParameterType",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "this",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "U",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "never",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "U",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Extracts the type of the 'this' parameter of a function type, or 'unknown' if the function type has no 'this' parameter.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ThisType",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ThisType",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Marker for contextual 'this' type",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "true",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "true",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "TypedPropertyDescriptor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TypedPropertyDescriptor",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "TypeError",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TypeError",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TypeError",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TypeErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "TypeErrorConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "TypeErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "typeof",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "typeof",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Uint8Array",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8Array",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8Array",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Uint8ArrayConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Uint8ClampedArray",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8ClampedArray",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8ClampedArray",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8ClampedArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0.\nIf the requested number of bytes could not be allocated an exception is raised.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Uint8ClampedArrayConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint8ClampedArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Uint16Array",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint16Array",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint16Array",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint16ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Uint16ArrayConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint16ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Uint32Array",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint32Array",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint32Array",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint32ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the\nrequested number of bytes could not be allocated an exception is raised.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "Uint32ArrayConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uint32ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "Uncapitalize",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uncapitalize",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "S",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "intrinsic",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Convert first character of string literal type to lowercase",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "undefined",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "undefined",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "unique",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "unique",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "unknown",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Uppercase",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Uppercase",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "S",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "intrinsic",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Convert string literal type to uppercase",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "URIError",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "URIError",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "URIError",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "URIErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "URIErrorConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "URIErrorConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "void",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "WeakKey",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "WeakKey",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "WeakKeyTypes",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "WeakKeyTypes",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Stores types to be used with WeakSet, WeakMap, WeakRef, and FinalizationRegistry",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ImportAssertions",
+          "kind": "interface",
+          "kindModifiers": "deprecated,declare",
+          "sortText": "z15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ImportAssertions",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "The type for the `assert` property of the optional second argument to `import()`.",
+              "kind": "text"
+            }
+          ],
+          "tags": [
+            {
+              "name": "deprecated"
+            }
+          ]
+        }
+      ],
+      "defaultCommitCharacters": [
+        ".",
+        ",",
+        ";"
+      ]
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/completionsCommitCharactersGlobal.ts",
+      "position": 481,
+      "name": "20"
+    },
+    "item": {
+      "flags": 0,
+      "isGlobalCompletion": false,
+      "isMemberCompletion": false,
+      "isNewIdentifierLocation": true,
+      "optionalReplacementSpan": {
+        "start": 480,
+        "length": 1
+      },
+      "entries": [
+        {
+          "name": "C",
+          "kind": "class",
+          "kindModifiers": "",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "class",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "C",
+              "kind": "className"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "I",
+          "kind": "interface",
+          "kindModifiers": "",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "I",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "T",
+          "kind": "type",
+          "kindModifiers": "",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "xyz",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "number",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "boolean",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "any",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "any",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Array",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Array",
+              "kind": "localName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Array",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ArrayBuffer",
+          "kind": "var",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "var",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Represents a raw buffer of binary data, which is used to store data for the\ndifferent typed arrays. ArrayBuffers cannot be read from or written to directly,\nbut can be passed to a typed array or DataView Object to interpret the raw\nbuffer as needed.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ArrayBufferConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ArrayBufferLike",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ArrayBufferTypes",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferTypes",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Allowed ArrayBuffer types for the buffer of an ArrayBufferView and related Typed Arrays.",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "ArrayBufferView",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferView",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "TArrayBuffer",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBufferLike",
+              "kind": "aliasName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayBuffer",
+              "kind": "localName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ArrayConstructor",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayConstructor",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "ArrayLike",
+          "kind": "interface",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ArrayLike",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            }
+          ],
+          "documentation": []
+        },
+        {
+          "name": "asserts",
+          "kind": "keyword",
+          "kindModifiers": "",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "asserts",
+              "kind": "keyword"
+            }
+          ]
+        },
+        {
+          "name": "Awaited",
+          "kind": "type",
+          "kindModifiers": "declare",
+          "sortText": "15",
+          "displayParts": [
+            {
+              "text": "type",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "Awaited",
+              "kind": "aliasName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=",
+              "kind": "operator"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "F",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "T",
+              "text": "F",
               "kind": "typeParameterName"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "T",
-          "kind": "type",
-          "kindModifiers": "",
-          "sortText": "11",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "type",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -83728,39 +90077,47 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "aliasName"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "value",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "infer",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "{",
-              "kind": "punctuation"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
-              "text": "    ",
+              "text": " ",
               "kind": "space"
             },
             {
-              "text": "[",
+              "text": "...",
               "kind": "punctuation"
             },
             {
-              "text": "xyz",
+              "text": "args",
               "kind": "parameterName"
             },
             {
@@ -83772,15 +90129,27 @@
               "kind": "space"
             },
             {
-              "text": "number",
+              "text": "infer",
               "kind": "keyword"
             },
             {
-              "text": "]",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "_",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": ")",
               "kind": "punctuation"
             },
             {
-              "text": ":",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
               "kind": "punctuation"
             },
             {
@@ -83788,44 +90157,31 @@
               "kind": "space"
             },
             {
-              "text": "boolean",
+              "text": "any",
               "kind": "keyword"
             },
             {
-              "text": ";",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "}",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "any",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+              "text": "V",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "any",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Array",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": " ",
+              "kind": "space"
+            },
             {
-              "text": "interface",
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -83833,85 +90189,92 @@
               "kind": "space"
             },
             {
-              "text": "Array",
-              "kind": "localName"
+              "text": "null",
+              "kind": "keyword"
             },
             {
-              "text": "<",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
-              "text": "T",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
-              "text": ">",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
-              "text": "\n",
-              "kind": "lineBreak"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "Array",
-              "kind": "localName"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
-              "text": ":",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "object",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ArrayBuffer",
-          "kind": "var",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
-              "kind": "keyword"
+              "text": "&",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "{",
+              "kind": "punctuation"
             },
             {
               "text": "\n",
               "kind": "lineBreak"
             },
             {
-              "text": "var",
-              "kind": "keyword"
+              "text": "    ",
+              "kind": "space"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "then",
+              "kind": "text"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "onfulfilled",
+              "kind": "parameterName"
             },
             {
               "text": ":",
@@ -83922,25 +90285,7 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
-            {
-              "text": "Represents a raw buffer of binary data, which is used to store data for the\ndifferent typed arrays. ArrayBuffers cannot be read from or written to directly,\nbut can be passed to a typed array or DataView Object to interpret the raw\nbuffer as needed.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ArrayBufferConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -83948,57 +90293,35 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ArrayBufferLike",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "F",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "type",
-              "kind": "keyword"
+              "text": ",",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "...",
+              "kind": "punctuation"
             },
             {
-              "text": " ",
-              "kind": "space"
+              "text": "args",
+              "kind": "parameterName"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ArrayBufferTypes",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -84006,111 +90329,83 @@
               "kind": "space"
             },
             {
-              "text": "ArrayBufferTypes",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": [
+              "text": "_",
+              "kind": "typeParameterName"
+            },
             {
-              "text": "Allowed ArrayBuffer types for the buffer of an ArrayBufferView and related Typed Arrays.",
-              "kind": "text"
-            }
-          ]
-        },
-        {
-          "name": "ArrayBufferView",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": ")",
+              "kind": "punctuation"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBufferView",
-              "kind": "interfaceName"
+              "text": "any",
+              "kind": "keyword"
             },
             {
-              "text": "<",
+              "text": ";",
               "kind": "punctuation"
             },
             {
-              "text": "TArrayBuffer",
-              "kind": "typeParameterName"
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "extends",
-              "kind": "keyword"
+              "text": "?",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBufferLike",
-              "kind": "aliasName"
+              "text": "F",
+              "kind": "typeParameterName"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayBuffer",
-              "kind": "localName"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": ">",
-              "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ArrayConstructor",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "value",
+              "kind": "parameterName"
+            },
             {
-              "text": "interface",
-              "kind": "keyword"
+              "text": ":",
+              "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "ArrayConstructor",
-              "kind": "interfaceName"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "ArrayLike",
-          "kind": "interface",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
-            {
-              "text": "interface",
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -84118,44 +90413,35 @@
               "kind": "space"
             },
             {
-              "text": "ArrayLike",
-              "kind": "interfaceName"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
+              "text": ",",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ">",
+              "text": "...",
               "kind": "punctuation"
-            }
-          ],
-          "documentation": []
-        },
-        {
-          "name": "asserts",
-          "kind": "keyword",
-          "kindModifiers": "",
-          "sortText": "15",
-          "displayParts": [
+            },
             {
-              "text": "asserts",
-              "kind": "keyword"
-            }
-          ]
-        },
-        {
-          "name": "Awaited",
-          "kind": "type",
-          "kindModifiers": "declare",
-          "sortText": "15",
-          "displayParts": [
+              "text": "args",
+              "kind": "parameterName"
+            },
             {
-              "text": "type",
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
               "kind": "keyword"
             },
             {
@@ -84163,19 +90449,19 @@
               "kind": "space"
             },
             {
-              "text": "Awaited",
-              "kind": "aliasName"
+              "text": "_",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
+              "text": ")",
               "kind": "punctuation"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": ">",
+              "text": "=>",
               "kind": "punctuation"
             },
             {
@@ -84183,15 +90469,23 @@
               "kind": "space"
             },
             {
-              "text": "=",
-              "kind": "operator"
+              "text": "any",
+              "kind": "keyword"
             },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -84223,7 +90517,7 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -84239,7 +90533,7 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "V",
               "kind": "typeParameterName"
             },
             {
@@ -84503,25 +90797,45 @@
               "kind": "space"
             },
             {
-              "text": "Awaited",
-              "kind": "aliasName"
+              "text": "V",
+              "kind": "typeParameterName"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "...",
-              "kind": "text"
+              "text": "extends",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "null",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
               "text": " ",
               "kind": "space"
             },
+            {
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
             {
               "text": ":",
               "kind": "punctuation"
@@ -84531,7 +90845,15 @@
               "kind": "space"
             },
             {
-              "text": "never",
+              "text": "V",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -84539,7 +90861,15 @@
               "kind": "space"
             },
             {
-              "text": ":",
+              "text": "object",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "&",
               "kind": "punctuation"
             },
             {
@@ -84547,8 +90877,32 @@
               "kind": "space"
             },
             {
-              "text": "T",
-              "kind": "typeParameterName"
+              "text": "{",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "then",
+              "kind": "text"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
             }
           ],
           "documentation": [
@@ -86724,8 +93078,100 @@
               "kind": "space"
             },
             {
-              "text": "ClassMemberDecoratorContext",
-              "kind": "aliasName"
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "ClassMethodDecoratorContext",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            },
+            {
+              "text": "this",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
             },
             {
               "text": " ",
@@ -86740,7 +93186,7 @@
               "kind": "space"
             },
             {
-              "text": "ClassDecoratorContext",
+              "text": "ClassGetterDecoratorContext",
               "kind": "interfaceName"
             },
             {
@@ -86748,35 +93194,51 @@
               "kind": "punctuation"
             },
             {
-              "text": "abstract",
+              "text": "unknown",
               "kind": "keyword"
             },
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "new",
+              "text": "unknown",
               "kind": "keyword"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
             {
               "text": " ",
               "kind": "space"
             },
             {
-              "text": "(",
+              "text": "|",
               "kind": "punctuation"
             },
             {
-              "text": "...",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ClassSetterDecoratorContext",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
               "kind": "punctuation"
             },
             {
-              "text": "args",
-              "kind": "parameterName"
+              "text": "unknown",
+              "kind": "keyword"
             },
             {
-              "text": ":",
+              "text": ",",
               "kind": "punctuation"
             },
             {
@@ -86784,9 +93246,69 @@
               "kind": "space"
             },
             {
-              "text": "any",
+              "text": "unknown",
               "kind": "keyword"
             },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ClassFieldDecoratorContext",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "text"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "|",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "ClassAccessorDecoratorContext",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "text"
+            },
+            {
+              "text": ">",
+              "kind": "punctuation"
+            },
             {
               "text": ")",
               "kind": "punctuation"
@@ -86796,7 +93318,7 @@
               "kind": "space"
             },
             {
-              "text": "=>",
+              "text": "|",
               "kind": "punctuation"
             },
             {
@@ -86804,8 +93326,16 @@
               "kind": "space"
             },
             {
-              "text": "any",
-              "kind": "keyword"
+              "text": "ClassDecoratorContext",
+              "kind": "interfaceName"
+            },
+            {
+              "text": "<",
+              "kind": "punctuation"
+            },
+            {
+              "text": "...",
+              "kind": "text"
             },
             {
               "text": ">",
@@ -86850,19 +93380,43 @@
               "kind": "space"
             },
             {
-              "text": "Record",
-              "kind": "aliasName"
+              "text": "{",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
               "kind": "punctuation"
             },
             {
-              "text": "PropertyKey",
-              "kind": "aliasName"
+              "text": "x",
+              "kind": "parameterName"
             },
             {
-              "text": ",",
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -86874,7 +93428,111 @@
               "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "x",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "number",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "x",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "symbol",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -86927,19 +93585,43 @@
               "kind": "space"
             },
             {
-              "text": "Record",
-              "kind": "aliasName"
+              "text": "{",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
               "kind": "punctuation"
             },
             {
-              "text": "PropertyKey",
-              "kind": "aliasName"
+              "text": "x",
+              "kind": "parameterName"
             },
             {
-              "text": ",",
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "string",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
             {
@@ -86951,7 +93633,111 @@
               "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "x",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "number",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "    ",
+              "kind": "space"
+            },
+            {
+              "text": "[",
+              "kind": "punctuation"
+            },
+            {
+              "text": "x",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "symbol",
+              "kind": "keyword"
+            },
+            {
+              "text": "]",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ";",
+              "kind": "punctuation"
+            },
+            {
+              "text": "\n",
+              "kind": "lineBreak"
+            },
+            {
+              "text": "}",
               "kind": "punctuation"
             },
             {
@@ -89247,15 +96033,23 @@
               "kind": "space"
             },
             {
-              "text": "Exclude",
-              "kind": "aliasName"
+              "text": "keyof",
+              "kind": "keyword"
             },
             {
-              "text": "<",
-              "kind": "punctuation"
+              "text": " ",
+              "kind": "space"
             },
             {
-              "text": "keyof",
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
               "kind": "keyword"
             },
             {
@@ -89263,11 +96057,15 @@
               "kind": "space"
             },
             {
-              "text": "T",
+              "text": "K",
               "kind": "typeParameterName"
             },
             {
-              "text": ",",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
               "kind": "punctuation"
             },
             {
@@ -89275,13 +96073,33 @@
               "kind": "space"
             },
             {
-              "text": "K",
-              "kind": "typeParameterName"
+              "text": "never",
+              "kind": "keyword"
             },
             {
-              "text": ">",
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
               "kind": "punctuation"
             },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "keyof",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "T",
+              "kind": "typeParameterName"
+            },
             {
               "text": "]",
               "kind": "punctuation"
@@ -89389,19 +96207,135 @@
               "kind": "space"
             },
             {
-              "text": "ThisParameterType",
-              "kind": "aliasName"
+              "text": "(",
+              "kind": "punctuation"
             },
             {
-              "text": "<",
+              "text": "T",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "extends",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "(",
               "kind": "punctuation"
             },
             {
-              "text": "T",
+              "text": "this",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "infer",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "U",
               "kind": "typeParameterName"
             },
             {
-              "text": ">",
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "...",
+              "kind": "punctuation"
+            },
+            {
+              "text": "args",
+              "kind": "parameterName"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "never",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "=>",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "?",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "U",
+              "kind": "typeParameterName"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "unknown",
+              "kind": "keyword"
+            },
+            {
+              "text": ")",
               "kind": "punctuation"
             },
             {
@@ -89678,22 +96612,6 @@
               "text": "symbol",
               "kind": "keyword"
             },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "|",
-              "kind": "punctuation"
-            },
-            {
-              "text": " ",
-              "kind": "space"
-            },
-            {
-              "text": "undefined",
-              "kind": "keyword"
-            },
             {
               "text": ",",
               "kind": "punctuation"
diff --git a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt
new file mode 100644
index 0000000000000..31f88d2e8c664
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.errors.txt
@@ -0,0 +1,42 @@
+Api.ts(6,5): error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
+Api.ts(7,5): error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
+Api.ts(8,5): error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
+
+
+==== http-client.ts (0 errors) ====
+    type TPromise<ResolveType, RejectType = any> = Omit<Promise<ResolveType>, "then" | "catch"> & {
+        then<TResult1 = ResolveType, TResult2 = never>(
+            onfulfilled?: ((value: ResolveType) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+            onrejected?: ((reason: RejectType) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+        ): TPromise<TResult1 | TResult2, RejectType>;
+        catch<TResult = never>(
+            onrejected?: ((reason: RejectType) => TResult | PromiseLike<TResult>) | undefined | null,
+        ): TPromise<ResolveType | TResult, RejectType>;
+    };
+    
+    export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
+        data: D;
+        error: E;
+    }
+    
+    export class HttpClient<SecurityDataType = unknown> {
+        public request = <T = any, E = any>(): TPromise<HttpResponse<T, E>> => {
+            return '' as any;
+        };
+    }
+==== Api.ts (3 errors) ====
+    import { HttpClient } from "./http-client";
+    
+    export class Api<SecurityDataType = unknown> {
+        constructor(private http: HttpClient<SecurityDataType>) { }
+    
+        abc1 = () => this.http.request();
+        ~~~~
+!!! error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
+        abc2 = () => this.http.request();
+        ~~~~
+!!! error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
+        abc3 = () => this.http.request();
+        ~~~~
+!!! error TS7056: The inferred type of this node exceeds the maximum length the compiler will serialize. An explicit type annotation is needed.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/quickInfoJsDocTags15.baseline b/tests/baselines/reference/quickInfoJsDocTags15.baseline
index da5ff2162dba0..ae4b452d6e2c5 100644
--- a/tests/baselines/reference/quickInfoJsDocTags15.baseline
+++ b/tests/baselines/reference/quickInfoJsDocTags15.baseline
@@ -6,7 +6,7 @@
 //                    ^^^
 // | ----------------------------------------------------------------------
 // | type Foo = {
-// |     getName: _a.Bar;
+// |     getName: (name: string) => string;
 // | }
 // | ----------------------------------------------------------------------
 //  */
@@ -17,7 +17,7 @@
 //                 ^^^
 // | ----------------------------------------------------------------------
 // | type Foo = {
-// |     getName: _a.Bar;
+// |     getName: (name: string) => string;
 // | }
 // | ----------------------------------------------------------------------
 //  */
@@ -28,7 +28,7 @@
 //                  ^^^
 // | ----------------------------------------------------------------------
 // | type Foo = {
-// |     getName: _a.Bar;
+// |     getName: (name: string) => string;
 // | }
 // | ----------------------------------------------------------------------
 //  */
@@ -98,16 +98,44 @@
           "kind": "space"
         },
         {
-          "text": "_a",
-          "kind": "aliasName"
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "name",
+          "kind": "parameterName"
         },
         {
-          "text": ".",
+          "text": ":",
           "kind": "punctuation"
         },
         {
-          "text": "Bar",
-          "kind": "aliasName"
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=>",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
         },
         {
           "text": ";",
@@ -188,16 +216,44 @@
           "kind": "space"
         },
         {
-          "text": "_a",
-          "kind": "aliasName"
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "name",
+          "kind": "parameterName"
         },
         {
-          "text": ".",
+          "text": ":",
           "kind": "punctuation"
         },
         {
-          "text": "Bar",
-          "kind": "aliasName"
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=>",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
         },
         {
           "text": ";",
@@ -278,16 +334,44 @@
           "kind": "space"
         },
         {
-          "text": "_a",
-          "kind": "aliasName"
+          "text": "(",
+          "kind": "punctuation"
         },
         {
-          "text": ".",
+          "text": "name",
+          "kind": "parameterName"
+        },
+        {
+          "text": ":",
           "kind": "punctuation"
         },
         {
-          "text": "Bar",
-          "kind": "aliasName"
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "=>",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
         },
         {
           "text": ";",
diff --git a/tests/baselines/reference/quickinfoVerbosityJs.baseline b/tests/baselines/reference/quickinfoVerbosityJs.baseline
index ae0aabf6777bd..dcd18f918c5ed 100644
--- a/tests/baselines/reference/quickinfoVerbosityJs.baseline
+++ b/tests/baselines/reference/quickinfoVerbosityJs.baseline
@@ -38,7 +38,9 @@
 // | ----------------------------------------------------------------------
 // | type SomeType2 = {
 // |     prop2: number;
-// |     prop3: SomeType;
+// |     prop3: {
+// |         prop1: string;
+// |     };
 // | }
 // | (verbosity level: 0)
 // | ----------------------------------------------------------------------
@@ -354,8 +356,48 @@
           "kind": "space"
         },
         {
-          "text": "SomeType",
-          "kind": "aliasName"
+          "text": "{",
+          "kind": "punctuation"
+        },
+        {
+          "text": "\n",
+          "kind": "lineBreak"
+        },
+        {
+          "text": "        ",
+          "kind": "space"
+        },
+        {
+          "text": "prop1",
+          "kind": "propertyName"
+        },
+        {
+          "text": ":",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        },
+        {
+          "text": ";",
+          "kind": "punctuation"
+        },
+        {
+          "text": "\n",
+          "kind": "lineBreak"
+        },
+        {
+          "text": "    ",
+          "kind": "space"
+        },
+        {
+          "text": "}",
+          "kind": "punctuation"
         },
         {
           "text": ";",
@@ -371,7 +413,7 @@
         }
       ],
       "documentation": [],
-      "canIncreaseVerbosityLevel": true,
+      "canIncreaseVerbosityLevel": false,
       "verbosityLevel": 0
     }
   },
diff --git a/tests/baselines/reference/quickinfoVerbosityMappedType.baseline b/tests/baselines/reference/quickinfoVerbosityMappedType.baseline
index 385bbf8803a75..8a97c31feb85c 100644
--- a/tests/baselines/reference/quickinfoVerbosityMappedType.baseline
+++ b/tests/baselines/reference/quickinfoVerbosityMappedType.baseline
@@ -29,7 +29,7 @@
 // | ----------------------------------------------------------------------
 //          ^
 // | ----------------------------------------------------------------------
-// | type F<T> = { [K in keyof T as T[K] extends Apple ? never : K]: T[K]; }
+// | type F<T> = { [K in keyof T as T[K] extends number | boolean ? never : K]: T[K]; }
 // | (verbosity level: 0)
 // | ----------------------------------------------------------------------
 // const y: { [K in keyof Bar]?: Bar[K] } = { banana: 'hello' };
@@ -52,7 +52,7 @@
 // | ----------------------------------------------------------------------
 //          ^
 // | ----------------------------------------------------------------------
-// | type G<T> = { [K in keyof T]: T[K] & Apple; }
+// | type G<T> = { [K in keyof T]: T[K] & (number | boolean); }
 // | (verbosity level: 0)
 // | ----------------------------------------------------------------------
 
@@ -324,8 +324,24 @@
           "kind": "space"
         },
         {
-          "text": "Apple",
-          "kind": "aliasName"
+          "text": "number",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "|",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "boolean",
+          "kind": "keyword"
         },
         {
           "text": " ",
@@ -401,7 +417,7 @@
         }
       ],
       "documentation": [],
-      "canIncreaseVerbosityLevel": true,
+      "canIncreaseVerbosityLevel": false,
       "verbosityLevel": 0
     }
   },
@@ -880,8 +896,32 @@
           "kind": "space"
         },
         {
-          "text": "Apple",
-          "kind": "aliasName"
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "number",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "|",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "boolean",
+          "kind": "keyword"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
         },
         {
           "text": ";",
@@ -897,7 +937,7 @@
         }
       ],
       "documentation": [],
-      "canIncreaseVerbosityLevel": true,
+      "canIncreaseVerbosityLevel": false,
       "verbosityLevel": 0
     }
   },
diff --git a/tests/baselines/reference/quickinfoVerbosityRecursiveType.baseline b/tests/baselines/reference/quickinfoVerbosityRecursiveType.baseline
index 672932bf789b7..06f05272040f9 100644
--- a/tests/baselines/reference/quickinfoVerbosityRecursiveType.baseline
+++ b/tests/baselines/reference/quickinfoVerbosityRecursiveType.baseline
@@ -5,8 +5,8 @@
 // | ----------------------------------------------------------------------
 // | type Node<T> = {
 // |     value: T;
-// |     left: Node<T> | undefined;
-// |     right: Node<T> | undefined;
+// |     left: Node;
+// |     right: Node;
 // | }
 // | (verbosity level: 0)
 // | ----------------------------------------------------------------------
@@ -41,8 +41,8 @@
 // | ----------------------------------------------------------------------
 // | type TreeNode<T> = {
 // |     value: T;
-// |     left: TreeNode<T> | undefined;
-// |     right: TreeNode<T> | undefined;
+// |     left: TreeNode;
+// |     right: TreeNode;
 // |     orange?: {
 // |         name: string;
 // |     };
@@ -53,8 +53,8 @@
 // | ----------------------------------------------------------------------
 // | type TreeNode<T> = {
 // |     value: T;
-// |     left: TreeNode<T> | undefined;
-// |     right: TreeNode<T> | undefined;
+// |     left: TreeNode;
+// |     right: TreeNode;
 // |     orange?: Orange;
 // | }
 // | (verbosity level: 0)
@@ -205,34 +205,6 @@
           "text": "Node",
           "kind": "aliasName"
         },
-        {
-          "text": "<",
-          "kind": "punctuation"
-        },
-        {
-          "text": "T",
-          "kind": "typeParameterName"
-        },
-        {
-          "text": ">",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "|",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "undefined",
-          "kind": "keyword"
-        },
         {
           "text": ";",
           "kind": "punctuation"
@@ -261,34 +233,6 @@
           "text": "Node",
           "kind": "aliasName"
         },
-        {
-          "text": "<",
-          "kind": "punctuation"
-        },
-        {
-          "text": "T",
-          "kind": "typeParameterName"
-        },
-        {
-          "text": ">",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "|",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "undefined",
-          "kind": "keyword"
-        },
         {
           "text": ";",
           "kind": "punctuation"
@@ -629,34 +573,6 @@
           "text": "TreeNode",
           "kind": "aliasName"
         },
-        {
-          "text": "<",
-          "kind": "punctuation"
-        },
-        {
-          "text": "T",
-          "kind": "typeParameterName"
-        },
-        {
-          "text": ">",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "|",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "undefined",
-          "kind": "keyword"
-        },
         {
           "text": ";",
           "kind": "punctuation"
@@ -685,34 +601,6 @@
           "text": "TreeNode",
           "kind": "aliasName"
         },
-        {
-          "text": "<",
-          "kind": "punctuation"
-        },
-        {
-          "text": "T",
-          "kind": "typeParameterName"
-        },
-        {
-          "text": ">",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "|",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "undefined",
-          "kind": "keyword"
-        },
         {
           "text": ";",
           "kind": "punctuation"
@@ -869,34 +757,6 @@
           "text": "TreeNode",
           "kind": "aliasName"
         },
-        {
-          "text": "<",
-          "kind": "punctuation"
-        },
-        {
-          "text": "T",
-          "kind": "typeParameterName"
-        },
-        {
-          "text": ">",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "|",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "undefined",
-          "kind": "keyword"
-        },
         {
           "text": ";",
           "kind": "punctuation"
@@ -925,34 +785,6 @@
           "text": "TreeNode",
           "kind": "aliasName"
         },
-        {
-          "text": "<",
-          "kind": "punctuation"
-        },
-        {
-          "text": "T",
-          "kind": "typeParameterName"
-        },
-        {
-          "text": ">",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "|",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "undefined",
-          "kind": "keyword"
-        },
         {
           "text": ";",
           "kind": "punctuation"
diff --git a/tests/baselines/reference/quickinfoVerbosityTypeParameter.baseline b/tests/baselines/reference/quickinfoVerbosityTypeParameter.baseline
index 4af6119b35d3e..0015d9c4870ba 100644
--- a/tests/baselines/reference/quickinfoVerbosityTypeParameter.baseline
+++ b/tests/baselines/reference/quickinfoVerbosityTypeParameter.baseline
@@ -11,12 +11,12 @@
 // | ----------------------------------------------------------------------
 //     ^
 // | ----------------------------------------------------------------------
-// | (parameter) x: T extends number | Str
+// | (parameter) x: T extends number | (string | {})
 // | (verbosity level: 1)
 // | ----------------------------------------------------------------------
 //     ^
 // | ----------------------------------------------------------------------
-// | (parameter) x: T extends FooType
+// | (parameter) x: T extends number | (string | {})
 // | (verbosity level: 0)
 // | ----------------------------------------------------------------------
 // }
@@ -103,12 +103,56 @@
           "kind": "space"
         },
         {
-          "text": "FooType",
-          "kind": "aliasName"
+          "text": "number",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "|",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "|",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "{",
+          "kind": "punctuation"
+        },
+        {
+          "text": "}",
+          "kind": "punctuation"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
         }
       ],
       "documentation": [],
-      "canIncreaseVerbosityLevel": true,
+      "canIncreaseVerbosityLevel": false,
       "verbosityLevel": 0
     }
   },
@@ -187,12 +231,40 @@
           "kind": "space"
         },
         {
-          "text": "Str",
-          "kind": "aliasName"
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "|",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "{",
+          "kind": "punctuation"
+        },
+        {
+          "text": "}",
+          "kind": "punctuation"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
         }
       ],
       "documentation": [],
-      "canIncreaseVerbosityLevel": true,
+      "canIncreaseVerbosityLevel": false,
       "verbosityLevel": 1
     }
   },
diff --git a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js
index 921b73d11702f..dc849584b1cf0 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/jsdocCallbackTag.js
@@ -244,7 +244,7 @@ Info seq  [hh:mm:ss:mss] response:
           "line": 19,
           "offset": 22
         },
-        "displayString": "type FooHandler2 = (eventName?: string | undefined, eventName2?: string) => any",
+        "displayString": "type FooHandler2 = (eventName?: string, eventName2?: string) => any",
         "documentation": "- What, another one?",
         "tags": []
       }
@@ -278,7 +278,7 @@ Info seq  [hh:mm:ss:mss] response:
           "line": 9,
           "offset": 21
         },
-        "displayString": "type FooHandler = (eventName: string, eventName2: number | string, eventName3: any) => number",
+        "displayString": "type FooHandler = (eventName: string, eventName2: string | number, eventName3: any) => number",
         "documentation": "- A kind of magic",
         "tags": []
       }
diff --git a/tests/cases/fourslash/server/jsdocCallbackTag.ts b/tests/cases/fourslash/server/jsdocCallbackTag.ts
index df1b9e1296919..2585598d8bab6 100644
--- a/tests/cases/fourslash/server/jsdocCallbackTag.ts
+++ b/tests/cases/fourslash/server/jsdocCallbackTag.ts
@@ -30,6 +30,6 @@ verify.quickInfoIs("var t: FooHandler");
 goTo.marker("2");
 verify.quickInfoIs("var t2: FooHandler2");
 goTo.marker("3");
-verify.quickInfoIs("type FooHandler2 = (eventName?: string | undefined, eventName2?: string) => any", "- What, another one?");
+verify.quickInfoIs("type FooHandler2 = (eventName?: string, eventName2?: string) => any", "- What, another one?");
 goTo.marker("8");
-verify.quickInfoIs("type FooHandler = (eventName: string, eventName2: number | string, eventName3: any) => number", "- A kind of magic");
+verify.quickInfoIs("type FooHandler = (eventName: string, eventName2: string | number, eventName3: any) => number", "- A kind of magic");